diff --git a/pom.xml b/pom.xml
index 35572fee..5b6b9ef3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
                 <plugin>
                     <groupId>org.rascalmpl</groupId>
                     <artifactId>rascal-maven-plugin</artifactId>
-                    <version>0.30.0-RC24</version>
+                    <version>0.30.0</version>
                     <configuration>
                         <errorsAsWarnings>false</errorsAsWarnings>
                         <bin>${project.build.outputDirectory}</bin>
@@ -155,7 +155,7 @@
         <dependency>
             <groupId>org.rascalmpl</groupId>
             <artifactId>rascal</artifactId>
-            <version>0.41.0-RC42</version>
+            <version>0.41.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/src/analysis/m3/LearnPrettyPrinter.rsc b/src/analysis/m3/LearnPrettyPrinter.rsc
index 026208a0..bd103c97 100644
--- a/src/analysis/m3/LearnPrettyPrinter.rsc
+++ b/src/analysis/m3/LearnPrettyPrinter.rsc
@@ -42,7 +42,7 @@ str filesToPrettyPrinter(set[loc] files, type[node] grammar, node (loc) parser)
     = treesToPrettyPrinter({parser(f) | f <- files}, grammar);
 
 @synopsis{Takes a corpus of syntax trees (for the same language!) and produces Rascal code that can generate code back from ASTs.}
-str treesToPrettyPrinter(set[node] asts, type[node] grammar) {
+str treesToPrettyPrinter(set[node] asts, type[node] _grammar) {
     // First we collect some general information for quick and easy reference later
     // This the string contents of each file 
     rel[loc, str] files  = {<l.top, readFile(l.top)> | n <- asts, loc l := n.src};
diff --git a/src/lang/cpp/ASTgen.rsc b/src/lang/cpp/ASTgen.rsc
index 4998c2b9..e527d934 100644
--- a/src/lang/cpp/ASTgen.rsc
+++ b/src/lang/cpp/ASTgen.rsc
@@ -111,7 +111,6 @@ str type2FactoryCall(Symbol t){
       case Symbol::\map(label(l1,ti),label(l2, ti2)) : return "tf.mapType(<type2FactoryCall(ti)>,\"<l1>\", <type2FactoryCall(ti2)>, \"<l2>\")";
       case Symbol::\map(ti,ti2) : return "tf.mapType(<type2FactoryCall(ti)>,<type2FactoryCall(ti2)>)";
       case Symbol::\tuple(tis) : return "tf.tupleType(<typeList2FactoryVarArgs(tis)>)";
-      case Symbol::\rel(tis) : return "tf.relType(<typeList2FactoryVarArgs(tis)>)";
       case Symbol::\adt(str name, _) : return "_<name>";
       default: 
         throw "Do not now how to construct <t>";  
@@ -260,7 +259,6 @@ str type2FactoryCall(Symbol t){
       case \bool() : return "IBool";
       case \list(_) : return "IList";
       case \map(_,_) : return "IMap";
-      case \rel(_) : return "IRelation";
       case \set(_) : return "ISet";
       case \loc() : return "ISourceLocation";
       case \str() :  return "IString";