Settings: House keeping

Change-Id: Iedb23b7883e4065317940156e8deae1e17ab7a3d
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>