Ensure sent messages are cleaned up from server handlers