Settings Cleanup

Change-Id: Ie1b35e0846c43baee4fbff57d8e8d1fee581ad8e