Improved message; the cause may also be the removal of deprecated entities
Refactored