Cleaned up some unused files and header references.