Clean up pipeline a bit