Moved ScriptExecutor and removed a duplicate behavior