Remove debug code, fix vspipe on win64
Merge branch 'master' into cuda