ISTWCMS-6398: removing entity modules as dependencies

Merge request reports