Clean up imports in app_server