removed old comments, debug code