diff --git a/src/libFLAC/stream_encoder.c b/src/libFLAC/stream_encoder.c
index 40b44b5d..a1f153b9 100644
--- a/src/libFLAC/stream_encoder.c
+++ b/src/libFLAC/stream_encoder.c
@@ -2135,28 +2135,24 @@ FLAC__bool add_subframe_(
 {
 	switch(subframe->type) {
 		case FLAC__SUBFRAME_TYPE_CONSTANT:
-//@@@@fprintf(stderr,"@@@@ add CONSTANT, bps=%u\n",subframe_bps);
 			if(!FLAC__subframe_add_constant(&(subframe->data.constant), subframe_bps, subframe->wasted_bits, frame)) {
 				encoder->protected_->state = FLAC__STREAM_ENCODER_FATAL_ERROR_WHILE_ENCODING;
 				return false;
 			}
 			break;
 		case FLAC__SUBFRAME_TYPE_FIXED:
-//@@@@fprintf(stderr,"@@@@ add FIXED, bps=%u, order=%u\n",subframe_bps,subframe->data.fixed.order);
 			if(!FLAC__subframe_add_fixed(&(subframe->data.fixed), frame_header->blocksize - subframe->data.fixed.order, subframe_bps, subframe->wasted_bits, frame)) {
 				encoder->protected_->state = FLAC__STREAM_ENCODER_FATAL_ERROR_WHILE_ENCODING;
 				return false;
 			}
 			break;
 		case FLAC__SUBFRAME_TYPE_LPC:
-//@@@@fprintf(stderr,"@@@@ add LPC, bps=%u, order=%u, prec=%u, shift=%d\n",subframe_bps,subframe->data.lpc.order,subframe->data.lpc.qlp_coeff_precision,subframe->data.lpc.quantization_level);
 			if(!FLAC__subframe_add_lpc(&(subframe->data.lpc), frame_header->blocksize - subframe->data.lpc.order, subframe_bps, subframe->wasted_bits, frame)) {
 				encoder->protected_->state = FLAC__STREAM_ENCODER_FATAL_ERROR_WHILE_ENCODING;
 				return false;
 			}
 			break;
 		case FLAC__SUBFRAME_TYPE_VERBATIM:
-//@@@@fprintf(stderr,"@@@@ add VERBATIM, bps=%u\n",subframe_bps);
 			if(!FLAC__subframe_add_verbatim(&(subframe->data.verbatim), frame_header->blocksize, subframe_bps, subframe->wasted_bits, frame)) {
 				encoder->protected_->state = FLAC__STREAM_ENCODER_FATAL_ERROR_WHILE_ENCODING;
 				return false;
diff --git a/src/share/grabbag/replaygain.c b/src/share/grabbag/replaygain.c
index 6b56933b..1ac4ad62 100644
--- a/src/share/grabbag/replaygain.c
+++ b/src/share/grabbag/replaygain.c
@@ -555,7 +555,6 @@ static FLAC__bool parse_double_(const FLAC__StreamMetadata_VorbisComment_Entry *
 	FLAC__ASSERT(0 != entry);
 	FLAC__ASSERT(0 != val);
 
-fprintf(stderr,"@@@@ tag=[");fwrite(entry->entry,1,entry->length,stderr);fprintf(stderr,"]\n");
 	p = (const char *)entry->entry;
 	q = strchr(p, '=');
 	if(0 == q)
@@ -563,14 +562,12 @@ fprintf(stderr,"@@@@ tag=[");fwrite(entry->entry,1,entry->length,stderr);fprintf
 	q++;
 	memset(s, 0, sizeof(s)-1);
 	strncpy(s, q, local_min(sizeof(s)-1, entry->length - (q-p)));
-fprintf(stderr,"@@@@ s=[%s]\n",s);
 
 	v = strtod(s, &end);
 	if(end == s)
 		return false;
 
 	*val = v;
-fprintf(stderr,"@@@@ v=[%0.12f]\n",v);
 	return true;
 }