Cleaned up Admin API.