[46270/46482] Minor cleanup