Remove unused messages
Add optimised output stream for use in blocking handlers