Code cleaning. Removed some "grouper" rubbish.