Merge "Removing unused admin_client"