--- a/cwconfig.py	Wed Jan 06 08:58:43 2016 +0100
+++ b/cwconfig.py	Mon Jan 04 11:12:30 2016 +0100
@@ -602,7 +602,7 @@
         cls.cls_adjust_sys_path()
         for ctlfile in ('web/webctl.py',  'etwist/twctl.py',
                         'server/serverctl.py',
-                        'devtools/devctl.py', 'goa/goactl.py'):
+                        'devtools/devctl.py',):
             if exists(join(CW_SOFTWARE_ROOT, ctlfile)):
                 try:
                     load_module_from_file(join(CW_SOFTWARE_ROOT, ctlfile))

--- a/doc/tools/pyjsrest.py	Wed Jan 06 08:58:43 2016 +0100
+++ b/doc/tools/pyjsrest.py	Mon Jan 04 11:12:30 2016 +0100
@@ -152,7 +152,6 @@
 
     'cubicweb.fckcwconfig.js',
     'cubicweb.fckcwconfig-full.js',
-    'cubicweb.goa.js',
     'cubicweb.compat.js',
     ])
 

--- a/web/data/cubicweb.goa.js	Wed Jan 06 08:58:43 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-/**
- *  functions specific to cubicweb on google appengine
- *
- *  :organization: Logilab
- *  :copyright: 2008-2010 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
- *  :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
- */
-
-/**
- * .. function:: rql_for_eid(eid)
- *
- * overrides rql_for_eid function from htmlhelpers.hs
- */
-function rql_for_eid(eid) {
-        return 'Any X WHERE X eid "' + eid + '"';
-}