Removed surplus code

Removed unused (commented) code.