Removed reference to deleted files.
Header cleanup.