Remove a redundant file and fix lint errors.