Moved Remove function after message was sent