Remove 2nd message sending