Remove dependency on admin link