Dead code cleanup
Removed blocks of commented code (some that didn't even reflect the code
as it is now), and commented out other code that was unused.