Clean up more unused code and removed unused files.