cleanup pipe
move pipe override to correct place