Clean up group capture code