Enabled KSM and done some cleanup