Remove all unneccessary diffs to oe-a fork