clean up of pipeline
Merged conflict