code cleanup

Change-Id: Idc59144c4b22ee90bae56ec9f3d0f4dd72ede832
Settings: fic active powersave (1/2)

Change-Id: I8bf84b91f821dc8a570d7798dc1686b529d756b0