diff --git a/.ghci b/.ghci
index 041c7d773..608944340 100644
--- a/.ghci
+++ b/.ghci
@@ -1,2 +1,2 @@
-:set -isrc/compiler -isrc/binary -isrc/runtime/haskell -isrc/server -isrc/example-based -isrc/server/transfer -idist/build/autogen -idist/build
+:set -isrc/compiler -isrc/binary -isrc/runtime/haskell -isrc/server -isrc/server/transfer -idist/build/autogen -idist/build
 :set -fwarn-unused-imports -optP-DSERVER_MODE -optP-DUSE_INTERRUPT -optP-DCC_LAZY -optP-include -optPdist/build/autogen/cabal_macros.h -odir dist/build/gf/gf-tmp -hidir dist/build/gf/gf-tmp -stubdir dist/build/gf/gf-tmp
diff --git a/gf.cabal b/gf.cabal
index 494f483eb..8c0e5e74b 100644
--- a/gf.cabal
+++ b/gf.cabal
@@ -287,9 +287,7 @@ Library
       CGIUtils
       Cache
       Fold
-      ExampleDemo
-      ExampleService
-    hs-source-dirs: src/server src/server/transfer src/example-based
+    hs-source-dirs: src/server src/server/transfer
 
   if flag(interrupt)
     cpp-options: -DUSE_INTERRUPT
diff --git a/src/compiler/GF/Server.hs b/src/compiler/GF/Server.hs
index c287e8001..9192ed9c9 100644
--- a/src/compiler/GF/Server.hs
+++ b/src/compiler/GF/Server.hs
@@ -43,7 +43,6 @@ import GF.Infra.UseIO(readBinaryFile,writeBinaryFile,ePutStrLn)
 import GF.Infra.SIO(captureSIO)
 import GF.Data.Utilities(apSnd,mapSnd)
 import qualified PGFService as PS
-import qualified ExampleService as ES
 import Data.Version(showVersion)
 import Paths_gf(getDataDir,version)
 import GF.Infra.BuildInfo (buildInfo)
@@ -171,7 +170,6 @@ handle logLn documentroot state0 cache execute1 stateVar
                (_  ,_             ,".pgf") -> do --debug $ "PGF service: "++path
                                                  wrapCGI $ PS.cgiMain' cache path
                (dir,"grammars.cgi",_     ) -> grammarList dir (decoded qs)
-               (dir  ,"exb.fcgi"  ,_    ) -> wrapCGI $ ES.cgiMain' root dir (PS.pgfCache cache)
                _ -> serveStaticFile rpath path
              where path = translatePath rpath
            _ -> return $ resp400 upath
@@ -209,7 +207,7 @@ handle logLn documentroot state0 cache execute1 stateVar
            ((_,(value,_)):qs1,qs2) -> do put_qs (qs1++qs2)
                                          return value
            _ -> err $ resp400 $ "no "++field++" in request"
-    
+
     inDir ok = cd =<< look "dir"
       where
         cd ('/':dir@('t':'m':'p':_)) =