Some cleanup. App does not reload ever.