Remove unused group
Add some globals