remove references to EntityMap