cleanup and simplify start. Include latests calabash-script