Removing unneded socket stuff