removing more debug code