Fix cucumber cleanup