Refactoring - Stage 2.
Remove unused files.