Further clean up pipeline