Added move socket
Fixed delete