Remove commented-out code

[jgfoster]

To facilitate debugging I've put in a number of commented-out lines with logging to the console. Eventually these should be removed.