patch clean up