Little more cleanup for usergroup