[s1888] Some code cleanup

(based on commit [12355] - a5ecaff)