Commented out code

[dkfellows]

It's my experience that code that is commented out rots on the vine as it fails to keep up with changes elsewhere. It's marginally better to use #if 0/#endif to prevent the compiler from building it, since then you get at least some basic syntax checking from your IDE, but it's actually better still to either delete things that are no longer wanted (git preserves them in the commit history; you don't lose them!) or to make them actually live code.

Pick an option and tidy things up:

1. Different comment-out style
2. Delete outdated code
3. Bring code back into service