Taps take multiple input files + strongly typed merge
Remove unused code