Settings: cleanup

Change-Id: I89b161d306b261dd1b3a85747e3171fed8228a9a