code cleanup stage 3b.