Cleaned up some code, made group av clean up properly after itself
when the group is killed.