Clean up

* Remove boilerplate comments
* Don't bleed cucumber from the acceptance tests package.