Fixed groups for the new version of gaffa
version bump and cleanup