More refactoring - unify SocketManager and MultiplexingSocketManager