Removed comments and unused functions. Trello 174