Remove the remaining bullshit
Add calabash for BDD