Removing options.on by grouping operations