[#81864230] More clean-up