admin users and groups views cleaned up