Fix class parsing
Revert changes to group adding/removing method
Merge pull request #88 from DieBuche/fixMyCleanup

Fix my cleanup