post-patch cleanup