AppDelegate cleaned up