put back the pipeline code; remove deprecated