Fix cleanup bug
Add userCount to Group JS