Removed some debug statements and commented-out code