Removed Reliance on ADK