More converted code cleanup