Try again with comments removed

Not sure if I had to close pull request and issue the other one but no harm done...