Clean up some TODOs and dead code
Get cucumber running (and failing)