Fix my cleanup

I made a bad change in the last big commit. With this commit adding items to a group should work correctly again. The other commit fixes the class parsing method, it got broke in some merge.

Thanks for taking in all my changes :)