Cleaned up cucumbers
Merge pull request #2258 from caffinatedmonkey/cucumber_cleanup