Remove dependency on SB-Admin