cleaning up home controller