Remove another unused file.
Reorganize files a bit. Remove a couple unused files.