Removes debugging code, updates message template