Removing more old references to output code.