Remove run stages and add chaining