Refactoring: deleted unused class Group