Cleanup Gherkin