got rid of encodemessage everywhere