Removed unused files and #include's to them.