Cucumber cleanup

Because it needed doing.