Removed remnants of previous merge and removed unecessary docstring quotes with nothing in them