Remove more admin references