debug code cleaning