Homehandler  cleanup