Removed some commented out debug echo calls.