continuing cleanup in HomeActivity