patches cleanup