More code cleanup - pt3