Remove a few unused files and their references.

Test: fix #1
Fix #2
Merge pull request #5 from mayhew-luke/develop

Test merge pull request