removed the entity and associate references to it refs #15