Merge "Remove input-scenario config options"