more debug code taken out