Remove cruft
Passing all three acceptance tests