Remove a few lines for units moved to the new code