[#46824777] Minor cleanup #2