AppDelegate clean up