[#46824777] Minor cleanup