Cleanups
Cleanups and new outgoing socket creation method #302