Preparing for code cleanup.