diff --git a/extra/fuel/fuel.factor b/extra/fuel/fuel.factor
index 1ef7f1666b..233768530f 100644
--- a/extra/fuel/fuel.factor
+++ b/extra/fuel/fuel.factor
@@ -1,10 +1,9 @@
 ! Copyright (C) 2008, 2009 Jose Antonio Ortega Ruiz.
 ! See http://factorcode.org/license.txt for BSD license.
-
-USING: accessors assocs compiler.units continuations fuel.eval fuel.help
-fuel.remote fuel.xref help.topics io.pathnames kernel namespaces parser
-sequences tools.scaffold vocabs.loader vocabs.parser words vocabs.files
-vocabs.metadata vocabs vocabs.hierarchy ;
+USING: accessors assocs compiler.units continuations fuel.eval
+fuel.help fuel.xref help.topics io.pathnames kernel namespaces parser
+sequences tools.scaffold vocabs vocabs.files vocabs.hierarchy
+vocabs.loader vocabs.metadata vocabs.parser words ;
 
 IN: fuel
 
@@ -165,7 +164,3 @@ PRIVATE>
     [ drop [ vocab-platforms-path ] keep swap vocab-append-path absolute-path fuel-eval-set-result ] 2bi ;
 
 : fuel-scaffold-get-root ( name -- ) find-vocab-root fuel-eval-set-result ;
-
-! Remote connection
-
-MAIN: fuel-start-remote-listener*
diff --git a/extra/fuel/remote/remote.factor b/extra/fuel/remote/remote.factor
index 27f0ffc9dd..b9cb3d139d 100644
--- a/extra/fuel/remote/remote.factor
+++ b/extra/fuel/remote/remote.factor
@@ -1,8 +1,6 @@
 ! Copyright (C) 2009, 2010 Jose Antonio Ortega Ruiz.
 ! See http://factorcode.org/license.txt for BSD license.
-
-USING: accessors io io.encodings.utf8 io.servers kernel math
-namespaces tty-server ;
+USING: io io.servers kernel math tty-server ;
 
 IN: fuel.remote
 
@@ -18,3 +16,6 @@ PRIVATE>
     print-banner integer? [ 9000 ] unless* <tty-server> start-server drop ;
 
 : fuel-start-remote-listener* ( -- ) f fuel-start-remote-listener ;
+
+! Remote connection
+MAIN: fuel-start-remote-listener*