Remove some unused messages
Fix property key
Alias zanataMessages to messages; implement Map