diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8cc6d4810a..7feb6cda42 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-11-29 20:44 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * src/compiler/hbmain.c
+  * src/compiler/ppcomp.c
+  * src/compiler/harbour.l
+    ! Deleted some more remains of -go support.
+
 2009-11-29 20:35 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbmisc/spd.c
     + Applied patch to add timestamp support.
diff --git a/harbour/src/compiler/harbour.l b/harbour/src/compiler/harbour.l
index c92473e043..6cf3570fd8 100644
--- a/harbour/src/compiler/harbour.l
+++ b/harbour/src/compiler/harbour.l
@@ -1,5 +1,5 @@
 %option noyywrap
-%{ 
+%{
 /*
  * $Id$
  */
@@ -319,7 +319,7 @@ Separator     {SpaceTab}
 	 	closing ']'
 	 */
     int i;
-	 
+
     BEGIN 0;
    yy_breakFlex();
 	 for( i = yyleng-1; i; --i )
@@ -849,8 +849,8 @@ Separator     {SpaceTab}
                pComp->pLex->lasttok = yytext;
                return FOR;
              }
-<FOREACH_>. { 
-               BEGIN 0;             
+<FOREACH_>. {
+               BEGIN 0;
                unput( yytext[ yyleng-1 ] );
                hb_comp_iState = FOREACH;
                pComp->pLex->lasttok = yytext;
@@ -1025,7 +1025,7 @@ Separator     {SpaceTab}
          }
          else
          {
-            if( hb_comp_iLanguage != HB_LANG_C && hb_comp_iLanguage != HB_LANG_OBJ_MODULE )
+            if( hb_comp_iLanguage != HB_LANG_C )
             {
                hb_compGenError( HB_COMP_PARAM, hb_comp_szErrors, 'F', HB_COMP_ERR_REQUIRES_C, NULL, NULL );
                hb_xfree( ( void * ) pInline->pCode );
@@ -1477,7 +1477,7 @@ Separator     {SpaceTab}
 %{
 /* ************************************************************************ */
 %}
-"while"|"whil"  { BEGIN WHILE_; 
+"while"|"whil"  { BEGIN WHILE_;
                   /* store it for later use */
                   pComp->pLex->lasttok = yylval_ptr->string = hb_compIdentifierNew( HB_COMP_PARAM, yytext, HB_IDENT_COPY );
                 }
@@ -1572,8 +1572,8 @@ Separator     {SpaceTab}
                   pComp->pLex->lasttok = yytext;
                   return WITH;
                }
-               
-               }              
+
+               }
 <WITH_>[\)] { /* ( with ) or with() */
                 BEGIN 0;
                 unput( yytext[ yyleng-1 ] );
@@ -1613,8 +1613,8 @@ Separator     {SpaceTab}
 		In case of &var we have to store in the pcode the source code
 		of the codeblock - the string with the whole codeblock
 		have to be saved. At runtime, this string is macro
-		expanded and the result string is next macro compiled to 
-		create a codeblock - this is called 'the early macro evaluation'. 
+		expanded and the result string is next macro compiled to
+		create a codeblock - this is called 'the early macro evaluation'.
 		  In contrast, the late macro evaluation &(var) creates
 		the codeblock at compile time - the macro is expanded
 		during the codeblock evaluation.
@@ -1629,7 +1629,7 @@ Separator     {SpaceTab}
 		 FOR i:=1 TO 3
 		   ? EVAL( cb[i] ) //prints '1','2','3'
 		 NEXT
-		 //late evaluation 
+		 //late evaluation
 		 FOR i:=1 TO 3
 		   a:=STR(i)
 		   cb[i] := {|| &(a)}
@@ -1644,7 +1644,7 @@ Separator     {SpaceTab}
 		int iPos=0;
 		int iCode=1;
 		char cMark='\0';
-		
+
 		yylval_ptr->asCodeblock.flags = 0;
 		cText = yytext+1;
 		iLen = 1;
@@ -1767,7 +1767,7 @@ Separator     {SpaceTab}
                  * characters should go to grammar analyser instead of printing it
                  * on stdout.
                  */
-            pComp->pLex->lasttok = yytext; 
+            pComp->pLex->lasttok = yytext;
             return yytext[ 0 ];
             }
 
@@ -1896,11 +1896,11 @@ static int yy_ConvertNumber( YYSTYPE *yylval_ptr, char * szBuffer )
 static int yy_ConvertDate( YYSTYPE *yylval_ptr, char * szBuffer )
 {
    int year, month, day;
-   
+
    hb_dateStrGet( szBuffer+2, &year, &month, &day );
    yylval_ptr->valLong.lNumber = hb_dateEncode( year, month, day );
    yylval_ptr->valLong.szValue = szBuffer;
-   
+
    return NUM_DATE;
 }
 
diff --git a/harbour/src/compiler/hbmain.c b/harbour/src/compiler/hbmain.c
index cce7338cf6..de6ffdf7d4 100644
--- a/harbour/src/compiler/hbmain.c
+++ b/harbour/src/compiler/hbmain.c
@@ -3932,16 +3932,6 @@ static void hb_compGenIncluded( HB_COMP_DECL )
                FileName.szExtension = ".hrb";
                break;
 
-#ifdef HB_LEGACY_LEVEL2
-            case HB_LANG_OBJ_MODULE:
-#  if ( defined( HB_OS_DOS ) || defined( HB_OS_WIN ) || defined( HB_OS_OS2 ) ) && \
-      !defined( __GNUC__ )
-               FileName.szExtension = ".obj";
-#  else
-               FileName.szExtension = ".o";
-#  endif
-               break;
-#endif
             default:
                FileName.szExtension = ".c";
          }
diff --git a/harbour/src/compiler/ppcomp.c b/harbour/src/compiler/ppcomp.c
index 4b9cde8087..773133b061 100644
--- a/harbour/src/compiler/ppcomp.c
+++ b/harbour/src/compiler/ppcomp.c
@@ -96,7 +96,7 @@ static void hb_pp_hb_inLine( void * cargo, char * szFunc,
 {
    HB_COMP_DECL = ( HB_COMP_PTR ) cargo;
 
-   if( HB_COMP_PARAM->iLanguage != HB_LANG_C && HB_COMP_PARAM->iLanguage != HB_LANG_OBJ_MODULE )
+   if( HB_COMP_PARAM->iLanguage != HB_LANG_C )
    {
       int iCurrLine = HB_COMP_PARAM->currLine;
       HB_COMP_PARAM->currLine = iLine;