diff --git a/Makefile b/Makefile
index 43b36254335..d5b3ebac73a 100644
--- a/Makefile
+++ b/Makefile
@@ -26,30 +26,17 @@
 BUILD_PARENT_DIRECTORY=.
 
 ifndef TOPDIR
-  TOPDIR:=$(shell \
-    if [ -r ./j2se/make/Makefile -o -r ./jdk/make/Makefile ]; then \
-      echo "."; \
-    else \
-      echo "../.."; \
-    fi)
+  TOPDIR:=.
 endif
 
 ifndef CONTROL_TOPDIR
-  CONTROL_TOPDIR=$(TOPDIR)/control
-  CONTROL_TOPDIR:=$(shell \
-    if [ -r $(TOPDIR)/control/make/Makefile ]; then \
-      echo "$(TOPDIR)/control"; \
-    else \
-      echo "$(TOPDIR)"; \
-    fi)
+  CONTROL_TOPDIR=$(TOPDIR)
 endif
 
 # Openjdk sources (only used if SKIP_OPENJDK_BUILD!=true)
 OPENJDK_SOURCETREE=$(TOPDIR)/openjdk
 OPENJDK_BUILDDIR:=$(shell \
-  if [ -r $(OPENJDK_SOURCETREE)/control/make/Makefile ]; then \
-    echo "$(OPENJDK_SOURCETREE)/control/make"; \
-  elif [ -r $(OPENJDK_SOURCETREE)/Makefile ]; then \
+  if [ -r $(OPENJDK_SOURCETREE)/Makefile ]; then \
     echo "$(OPENJDK_SOURCETREE)"; \
   else \
     echo "."; \
@@ -497,10 +484,6 @@ include ./make/jprt.gmk
 	fastdebug_build debug_build product_build setup \
         dev dev-build dev-sanity dev-clobber
 
-# FIXUP: Old j2se targets
-j2se_fastdebug_only: jdk_fastdebug_only
-j2se_only: jdk_only
-
 # Force target
 FRC:
 
diff --git a/make/jdk-rules.gmk b/make/jdk-rules.gmk
index da97562b591..f5e4533cd07 100644
--- a/make/jdk-rules.gmk
+++ b/make/jdk-rules.gmk
@@ -121,11 +121,3 @@ compare-image-clobber:
 
 .PHONY: jdk jdk-build jdk-clobber jdk-sanity 
 
-# FIXUP: Old j2se target names
-j2se-build: jdk-build
-j2se-clobber:: jdk-clobber
-j2se-sanity:: jdk-sanity
-j2se: jdk
-
-.PHONY: j2se j2se-build j2se-clobber j2se-sanity 
-