Sort messages.

Fixes a todo.
Remove unused messages.

This might not be all of the unused messages, but it's a start.