- removed old, commented debug code