Before getting rid of old group class