Started removing socket references where they weren't necessary
Removed a bunch of unnecessarily passed actor references