OP-1465 - Fix build on windows, force the removal on cleanup