Took out unnecessary (and broken) pipelining support