Tidy up application group entity