removed commented out debug code