Index: /libmpc/branches/r2d/mpcenc/mpcenc.c
===================================================================
--- /libmpc/branches/r2d/mpcenc/mpcenc.c	(revision 199)
+++ /libmpc/branches/r2d/mpcenc/mpcenc.c	(revision 200)
@@ -58,5 +58,4 @@
 double        Duration        = 1.e+99; // Maximum encoded audio length
 mpc_bool_t    FrontendPresent = 0;      // Flag for frontend-detection
-mpc_bool_t    XLevel          = 1;      // Encode extreme levels with relative SCFs
 
 #if MPPENC_MINOR % 2 == 0
@@ -296,6 +295,4 @@
     stderr_printf (
              "  --minval x       calculation of MinVal (1:Buschmann, 2,3:Klemm)\n" );
-    stderr_printf (
-             "  --noxlevel       use old filterbank clipping solving strategy\n" );
     stderr_printf (
              "\n" );
@@ -973,10 +970,4 @@
             m->ShortThr = (float) atof (argv[k]);
         }
-        else if ( 0 == strcmp ( arg, "noxlevel") ) {                                      // Xlevel
-            XLevel = 0;
-        }
-        else if ( 0 == strcmp ( arg, "xlevel") ) {                                      // Xlevel
-            stderr_printf ( "\nXlevel coding now enabled by default, --xlevel ignored.\n" );
-        }
         else if ( 0 == strcmp ( arg, "nmt") ) {                                         // NMT
             if ( ++k >= argc ) { stderr_printf ( errmsg, arg );  return -1; }
@@ -1262,6 +1253,6 @@
                     "       to file '%s'\n"
                     "\n"
-                    " SV %u.%u%s, Profile '%s'\n",
-                    inDatei, outDatei, 7, m->PNS > 0 ? 1 : 0, XLevel ? " + XLevel coding" : "", Profiles [m->MainQual] );
+                    " SV %u, Profile '%s'\n",
+                    inDatei, outDatei, 8, Profiles [m->MainQual] );
 
     if ( verbose > 0 ) {
@@ -1421,19 +1412,9 @@
 {
 	if ( e->Overflows > 0 ) {                                                // report internal clippings
-		if ( XLevel == 0 ) {
-			stderr_printf ( "\n"
-					"\033[1m\rWARNING:\n"
-					"\033[0m\r  There occured %u internal clippings due to a restriction of StreamVersion 7.\n"
-					"  Re-encode with '--scale %.3f', or use option '--xlevel', which normally can\n"
-					"  handle this situation but don't work well with old decoders.\a\n\n",
-			e->Overflows, ScalingFactorl * 32767. / MaxOverFlow - 0.0005f );
-		}
-		else {
-			stderr_printf ( "\n"
-					"\033[1m\rWARNING:\n"
-					"\033[0m\r  There still occured %u SCF clippings due to a restriction of StreamVersion 7.\n"
-					"  Use the '--scale' method to avoid additional distortions. Note that this\n"
-					"  file already has annoying distortions due to slovenly CD mastering.\a\n\n", e->Overflows );
-		}
+		stderr_printf ( "\n"
+				"\033[1m\rWARNING:\n"
+				"\033[0m\r  There still occured %u SCF clippings.\n"
+				"  Use the '--scale' method to avoid additional distortions. Note that this\n"
+				"  file already has annoying distortions due to slovenly CD mastering.\a\n\n", e->Overflows );
 	}
 }