More cleanup for entities to make them more private