Cleaning up the android app