Simplify socket setup/teardown
rebuilt leap