Merge pull request #2446 from akoeplinger/remove-leftover-file