Cleaned up how to deal with adding/removing groups on update.