595-65 Recommit

Removed some commented code