Drop group registration code (#393)
Merge branch 'feature393'