more cleanup/separation of admin functions