Remove unneeded code and files.
Fix some references.