Cleaning up HomeScreenActivity