Cleaning the app up.