Clean up support for sending messages to users