Merge pull request #2940 from codesparkle/remove-unused-files