Remove entity import from return value