Removed dummy output and leftover TODOs
Merge pull request #19 from dmitriid/in-progress

Removed dummy output and leftover TODOs