Remove comments

Trello 144.

* all specs pass
* please delete branch after merge.