revert back and don't do socket clean up