some last cleanup to patchmaker