PIM-1597 Removes relations between pure entities and models