File cleanup
Merge pull request #4540 from jspekken/patch-1

File cleanup