Settings : Re-organize menu structure

Change-Id: I7e03f1a8e1da4545d933b91c1a50e5cf72ab4ab0
Remove debug leftovers.

Change-Id: I7690238a2ea4a14577687f8ba46e1515771aaa88
Remove unused stuff.

Change-Id: I8964c4ffd3e1917ac8ee6fd0df177cd546de5b4f