WIP Settings cleanup.....more coming tonight

Change-Id: Iaee6850fefca03aac768116b5be088bdc33e05ae