Use OrderedSet#delete instead of (deprecated) OrderedSet#remove