Various code cleanup:

* remove unused and missnamed __niit__
* use group_id rather than group.id when setting _old_group