Remove CM stuff we dont use and clean up the settings app

Change-Id: I5ff57cde1560899e1b59a4be9301ab9b6a7e4d7a