Fix old terminator deletion (condition!) and stop VS from crying about mismatching files