Delete option classes, modify abstract task classes