@@ -9,16 +9,13 @@ phpmaster
 php
 !lib/php
 !bin/php
-rmtools-client
-rmtools.base
 logs
 PFTT
 \.tmp
 \.cache
 oracle
 # either these two become submodules, or uncomment them
 #pgo-build
-#rmtools*
 phpsdk-local.bat
 pgo/work
 !pgo/tpl/php
 
@@ -212,11 +212,6 @@ public static function guessCurrentBranchName() : ?string
 		$branch = NULL;
 		$found = false;
 
-		$rmtools_branch = getenv("PHP_RMTOOLS_PHP_BUILD_BRANCH");
-		if ("master" == $rmtools_branch) {
-			return "master";
-		}
-
 		/* Try to figure out the branch. The worky scenarios are
 			- CWD is in php-src
 			- phpize is on the path