Nearly done reducing odcctools.patch