Remove commented code
Closes #19