Clean up of some codes.

Cleaning up the pipeline.