Do some cleanup for messages

Make all MESSAGE_TYPE attributes final
Remove unneeded TODO