Cleanup

Change-Id: Ifeb06ff1c2e35af53dc2eff2dc91729146a5d3ac
enable KSM

Change-Id: Id60a5b09db32881812c96ca00948388c084ac7b8