Further simplifications for pipelines