More code cleanup - pt2