Cleanup: CheckBoxes to SwitchBoxes

Also remove unwanted preferences

Change-Id: I69a1428d052f2a899be635fd9a7daa683f8989f0