Remove cucumber
Merge branch 'dev' into spec