Clean-up of pipeline script