Remove CustomOutput from main driver