Settings: cleanup

Change-Id: Ib7207317ed1e59721194d4fff0e52949aa6ab113