Settings: remove reduplicate class

Change-Id: I4bc10fe00822000a63283d9ce62ab067095f4d01
Settings: cleanup

Change-Id: Id07038049aa9181286234c2083864c428ed0c9a8