Large code cleanups.