Remove commented out, unused code

Some few lines of commented out code is left, that might be useful
for debugging.
Merge pull request #413 from mstorsjo/remove-commented-code

Remove commented out, unused code