Remove traces of improper file skipping mechanism