Fix the home button issue and remove some unneeded code: