[#81500686] A bit of clean-up