Update to use Latest version of Calabash, clean up