diff --git a/compiler2/main.cc b/compiler2/main.cc
index 6e4254a56bf93a2779058f9935f8c69bede1d651..7aa15b468bd106685348301c6be0471a57c8fa66 100644
--- a/compiler2/main.cc
+++ b/compiler2/main.cc
@@ -682,7 +682,10 @@ int main(int argc, char *argv[])
         break;
       case 'k':
         SET_FLAG(k);
-        oop_features = TRUE;
+        //oop_features = TRUE;
+        // disabled for the release
+        errflag = true;
+        print_usage = true;
         break;
       case 'K':
         SET_FLAG(K);
diff --git a/compiler2/ttcn3/compiler.l b/compiler2/ttcn3/compiler.l
index a70536cb430f3de361d6b6c6bbd8eb4ef77746f6..1a157ec2d7f24d830958577990abd9136d8f0895 100644
--- a/compiler2/ttcn3/compiler.l
+++ b/compiler2/ttcn3/compiler.l
@@ -563,9 +563,9 @@ class {
     RETURN(ClassKeyword);
   }
   else {
-    Location loc(infile, yylloc);
+    /*Location loc(infile, yylloc);
     loc.warning("Keyword 'class' is treated as an identifier. Activate "
-      "compiler option '-k' to use object-oriented features.");
+      "compiler option '-k' to use object-oriented features.");*/
     yylval.id = new Identifier(Identifier::ID_TTCN, string(yyleng, yytext));
     RETURN_LVAL(IDentifier);
   }
@@ -575,9 +575,9 @@ finally {
     RETURN(FinallyKeyword);
   }
   else {
-    Location loc(infile, yylloc);
+    /*Location loc(infile, yylloc);
     loc.warning("Keyword 'finally' is treated as an identifier. Activate "
-      "compiler option '-k' to use object-oriented features.");
+      "compiler option '-k' to use object-oriented features.");*/
     yylval.id = new Identifier(Identifier::ID_TTCN, string(yyleng, yytext));
     RETURN_LVAL(IDentifier);
   }