Cleaned up group management controller