SWC-584 Remove code that promotes entity version