Fixed send-on-demand from client and removed dummy class "SendData"