Trimming some debug code