diff --git a/components/codetools/codecompletiontool.pas b/components/codetools/codecompletiontool.pas
index d23297baf9..d53ae749bb 100644
--- a/components/codetools/codecompletiontool.pas
+++ b/components/codetools/codecompletiontool.pas
@@ -1122,7 +1122,6 @@ end;
 
 function TCodeCompletionCodeTool.ApplyClassCompletion: boolean;
 begin
-  DebugLn(['TCodeCompletionCodeTool.ApplyClassCompletion DoInsertSpaceInFront=',AtomTypesToStr(ASourceChangeCache.BeautifyCodeOptions.DoInsertSpaceInFront),' DoInsertSpaceAfter=',AtomTypesToStr(ASourceChangeCache.BeautifyCodeOptions.DoInsertSpaceAfter)]);
   Result:=false;
   try
     // insert all new class parts
@@ -3187,6 +3186,8 @@ begin
   
   CursorNode:=FindDeepestNodeAtPos(CleanCursorPos,true);
   CodeCompleteSrcChgCache:=SourceChangeCache;
+
+  DebugLn(['TCodeCompletionCodeTool.CompleteCode DoInsertSpaceInFront=',AtomTypesToStr(CodeCompleteSrcChgCache.BeautifyCodeOptions.DoInsertSpaceInFront),' DoInsertSpaceAfter=',AtomTypesToStr(CodeCompleteSrcChgCache.BeautifyCodeOptions.DoInsertSpaceAfter)]);
   {$IFDEF CTDEBUG}
   DebugLn('TCodeCompletionCodeTool.CompleteCode A CleanCursorPos=',dbgs(CleanCursorPos),' NodeDesc=',NodeDescriptionAsString(CursorNode.Desc));
   {$ENDIF}
diff --git a/lcl/maskedit.pp b/lcl/maskedit.pp
index 9b13d56f1b..96b1ebfd3f 100644
--- a/lcl/maskedit.pp
+++ b/lcl/maskedit.pp
@@ -59,9 +59,6 @@ type
 
   EDBEditError = class(Exception);
 
-  //TMbcsByteType = (mbSingleByte, mbLeadByte, mbTrailByte);
-  
-
   { TCustomMaskEdit }
 
   TMaskCharType = (mcNone, mcLiteral, mcIntlLiteral, mcDirective, mcMask,