Remove extraneous chaining