Update to remove multiple already expired messages