Cleanup pipes some more