Cucumber cleanup

(work in progress)