Remove duplicate file, adjust Makefile to use the original copy.