Major cleanup, almost done.