Merge pull request #6046 from etracer65/remove_unneded_file