Clean up some group code