Continue major cleanups internally.