revert a couple of pieces of commit
5fe99ea3
"loplugin:unusedmethods in sw"

Change-Id: If1eb9c7f01dcdea7ef7059165470357d5186ff93