diff --git a/src/org/rascalmpl/compiler/lang/rascalcore/check/tests/StaticTestingUtils.rsc b/src/org/rascalmpl/compiler/lang/rascalcore/check/tests/StaticTestingUtils.rsc
index 3281a35486..351218416d 100644
--- a/src/org/rascalmpl/compiler/lang/rascalcore/check/tests/StaticTestingUtils.rsc
+++ b/src/org/rascalmpl/compiler/lang/rascalcore/check/tests/StaticTestingUtils.rsc
@@ -46,6 +46,8 @@ import lang::rascalcore::check::RascalConfig;
 import lang::rascalcore::check::Checker;
 import lang::rascal::\syntax::Rascal;
 
+extend analysis::typepal::Collector; // for private isContainedIn
+
 bool verbose = false;
 
 PathConfig pathConfigForTesting() {
diff --git a/src/org/rascalmpl/library/Location.rsc b/src/org/rascalmpl/library/Location.rsc
index fe165676dd..c812df006e 100644
--- a/src/org/rascalmpl/library/Location.rsc
+++ b/src/org/rascalmpl/library/Location.rsc
@@ -212,40 +212,3 @@ loc cover(list[loc] locs){
         }
     }
 }
-
-// Note: this is a duplicate of LogicalLocation in typepal
-// TODO: remove the one in TypePal
-
-bool isLexicallyLess(loc l, loc r, map[loc,loc] m)
-    = isLexicallyLess(l in m ? m[l] : l, r in m ? m[r] : r);
-
-bool isStrictlyContainedIn(loc inner, loc outer, map[loc,loc] m)
-    = isStrictlyContainedIn(inner in m ? m[inner] : inner, outer in m ? m[outer] : outer);
-
-bool isContainedIn(loc inner, loc outer, map[loc,loc] m)
-    = isContainedIn(inner in m ? m[inner] : inner, outer in m ? m[outer] : outer);
-
-// bool beginsBefore(loc inner, loc outer, map[loc,loc] m)
-//     = beginsBefore(inner in m ? m[inner] : inner, outer in m ? m[outer] : outer);
-
-bool isBefore(loc inner, loc outer, map[loc,loc] m)
-    = isBefore(inner in m ? m[inner] : inner, outer in m ? m[outer] : outer);
-
-bool isImmediatelyBefore(loc inner, loc outer, map[loc,loc] m)
-    = isImmediatelyBefore(inner in m ? m[inner] : inner, outer in m ? m[outer] : outer);
-
- bool beginsAfter(loc inner, loc outer, map[loc,loc] m)
-    = beginsAfter(inner in m ? m[inner] : inner, outer in m ? m[outer] : outer);
-
-bool isAfter(loc inner, loc outer, map[loc,loc] m)
-    = beginsAfter(inner in m ? m[inner] : inner, outer in m ? m[outer] : outer);
-
-bool isImmediatelyAfter(loc inner, loc outer, map[loc,loc] m)
-    = isImmediatelyAfter(inner in m ? m[inner] : inner, outer in m ? m[outer] : outer);
-
-bool isOverlapping(loc inner, loc outer, map[loc,loc] m)
-    = isOverlapping(inner in m ? m[inner] : inner, outer in m ? m[outer] : outer);
-
-loc cover(list[loc] locs, map[loc,loc] m)
-    = cover([l in m ? m[l] : l | l <- locs]);
-