Clean up stauff after pull request merge