Merge "remove unneeded RecordedOps"