removed unused console.log and comments
Removed unused code and completed todos, see #38