Removing ws dependency