Code cleanup and up one level.
Some updates for 2.2
Fixing missing group id param.