clean up and moving stuff out of home controller