Settings: cleanup

Change-Id: I392467b665fcccb837a76c2adad2fe8a63b968b9

cleanup

Change-Id: Ie5ea3bff92bc496e075f8b107ac37362314fb9f1

cleanup

Change-Id: I1447b4e23e0a06129ca1e1a271a4c9b85e6a7864