Large code cleanup.