Remove old nvcc 6.5 WAR