Remove dependency on admin keys