commented out debug messages
removed extra comments