ManualPatcher cleanups