Full GroupTable and some cleanup