Minor Housekeeping

Removed some commented code that is no longer needed (was previously
kept for reference).