refactoring entity groups

most entity groups are not needed