diff --git a/compiler/ccharset.pas b/compiler/ccharset.pas
index 99ee1831dd..88946c9468 100644
--- a/compiler/ccharset.pas
+++ b/compiler/ccharset.pas
@@ -25,7 +25,6 @@ unit ccharset;
        tunicodestring = ^tunicodechar;
 
        tcsconvert = class
-         // !!!!!!1constructor create;
        end;
 
        tunicodecharmappingflag = (umf_noinfo,umf_leadbyte,umf_undefined,
@@ -205,7 +204,7 @@ unit ccharset;
               hp:=hp^.next;
            end;
          getmap:=nil;
-      end;////////
+      end;
 
     function getmap(cp : word) : punicodemap;
 
diff --git a/compiler/widestr.pas b/compiler/widestr.pas
index 5d37db23c3..2db017db0d 100644
--- a/compiler/widestr.pas
+++ b/compiler/widestr.pas
@@ -28,7 +28,7 @@ unit widestr;
   interface
 
     uses
-       {$if FPC_FULLVERSION<20700}ccharset{$else}charset{$endif},globtype;
+      charset,globtype;
 
 
     type
@@ -69,7 +69,6 @@ unit widestr;
   implementation
 
     uses
-      {$if FPC_FULLVERSION>20700}
       { use only small codepage maps, others will be }
       { loaded on demand from -FM path               }
 
@@ -81,7 +80,6 @@ unit widestr;
       cp8859_1,cp850,cp437,cp1252,cp646,
       cp874, cp856,cp852,cp8859_2,
       cp1250,cp1254,cp1255,cp1256,cp1257,cp1258,
-      {$endif}
       globals,cutils;
 
 
@@ -292,19 +290,15 @@ unit widestr;
     function cpavailable(const s: string): boolean;
       begin
         result:=mappingavailable(lower(s));
-        {$if FPC_FULLVERSION>20700}
         if not result then
           result:=(unicodepath<>'')and(registerbinarymapping(unicodepath+'charset',lower(s)));
-        {$ifend}
       end;
 
     function cpavailable(cp: word): boolean;
       begin
         result:=mappingavailable(cp);
-        {$if FPC_FULLVERSION>20700}
         if not result then
           result:=(unicodepath<>'')and(registerbinarymapping(unicodepath+'charset','cp'+tostr(cp)));
-        {$ifend}
       end;
 
     procedure changecodepage(