More code cleanup - pt4