Removed unused messages
Added leading comment to messages