ConnectWays: cleanup
ConnectWays: more cleanup