removed more debug code