Clean up group.py