- removed commented debug code