Cleaning up some events to simplify the app