Removing unnecessary BufferWatermark class.