Some cleanup on app object