[#883909] Slight cleanup