Remove promoting entity version
Further clean up