Bug 23590: Cleaning - Remove op_* vars