Cleaning up the app