pipe-cleanup: Change the way in which we cleanup pipes

First go at making sure we cleanup the pipe that we use properly
in our BaseFetch.