Removed unused variables.
Blunt removal of commented code containing dprint.