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.
Can you go thru and make sure none of them say NoPrefix? We should consider deleting the NoPrefix category at this point