Make Go sockets match Mylar port #s
Cleans up some cruft
Removes more cruft
Removes more cruft
Removes more cruft
Renames some things