Cleaned up diagnostic messages

Removed duplicate and unused messages.

Note: The commit relating to unused diagnostic messages can be used as a reference for potential feature gaps.
Old error seems better