Remove a bunch of junk that I left in by accident.