Remove useless refs to the Calabash namespaces