--- a/javatools/subsystem.mk	Wed Sep 15 12:05:25 2010 +0300
+++ b/javatools/subsystem.mk	Wed Oct 13 14:23:59 2010 +0300
@@ -19,9 +19,7 @@
 # Common
 COMPONENTS = \
 	tckrunner/starter/build \
-	tckrunner/runner/build \
-	javacontrolpanel/starter/build \
-	javacontrolpanel/controlpanel/build \
+	tckrunner/runner/build
 
 # Platform specific
 ifeq ($(BUILDENV),symbian)
@@ -42,14 +40,10 @@
 	usersettingsconfigurator/build \
 	javarestoreconverter/build 
 
-else
-
-COMPONENTS += \
-	javafinishjrtinstall/build
-
 endif
 
 NONQTSUBSYSTEMS += \
+	javacaptain_app/build \
 	testcerts
 
 endif