diff --git a/resources/frontend_client/app/card/card.module.js b/resources/frontend_client/app/card/card.module.js
index e098a24d18d80097d522913556cc7c384c54e0d3..4859347e78af86867772399821af87b853ebc045 100644
--- a/resources/frontend_client/app/card/card.module.js
+++ b/resources/frontend_client/app/card/card.module.js
@@ -7,7 +7,6 @@ var Card = angular.module('metabase.card', [
     'metabase.filters',
     'metabase.directives',
     'metabase.services',
-    'metabase.aceeditor.directives',
     'metabase.card.services',
     'metabase.card.controllers',
     'metabase.card.directives'
diff --git a/resources/frontend_client/app/directives.js b/resources/frontend_client/app/directives.js
index df1132f839e1573c232ebf5eed372f9bf96b5802..4d30aee7e9243f175b5502370186989039f79e5a 100644
--- a/resources/frontend_client/app/directives.js
+++ b/resources/frontend_client/app/directives.js
@@ -1,7 +1,5 @@
 'use strict';
 
-/*global ace*/
-
 import { Provider } from 'react-redux';
 import { DevTools, DebugPanel } from 'redux-devtools/lib/react';
 
@@ -232,67 +230,3 @@ NavbarDirectives.directive('mbProfileLink', [function () {
         },
     };
 }]);
-
-var MetabaseACEEditorDirectives = angular.module('metabase.aceeditor.directives', ['ui.ace']);
-
-MetabaseACEEditorDirectives.directive('mbAceSqlEditor', function() {
-
-    function controller($scope, Metabase) {
-        $scope.aceLoaded = function(aceEditor) {
-            if ($scope.onLoad) {
-                var fn = $scope.onLoad();
-                if (fn) fn(aceEditor);
-            }
-
-            var aceLanguageTools = ace.require('ace/ext/language_tools');
-            aceEditor.setOptions({
-                enableBasicAutocompletion: true,
-                enableSnippets: true,
-                enableLiveAutocompletion: true
-            });
-
-            aceLanguageTools.addCompleter({
-                getCompletions: function(editor, session, pos, prefix, callback) {
-                    if (prefix.lengh === 0 || !$scope.database) {
-                        console.log("$scope.database is not set, unable to perform autocompletions for ACE Editor :'(");
-                        callback(null, []);
-                        return;
-                    }
-
-                    Metabase.db_autocomplete_suggestions({
-                        dbId: $scope.database,
-                        prefix: prefix
-                    }, function(results) {
-                        // transform results of the API call into what ACE expects
-                        var js_results = results.map(function(result) {
-                            return {
-                                name: result[0],
-                                value: result[0],
-                                meta: result[1]
-                            };
-                        });
-                        callback(null, js_results);
-
-                    }, function(error) {
-                        console.log(error);
-                        callback(null, []);
-                    });
-                }
-            });
-
-            // focus the editor on load to allow faster editing of query
-            aceEditor.focus();
-        };
-    }
-
-    return {
-        restrict: 'E',
-        templateUrl: '/app/components/editor/editor.html',
-        controller: ['$scope', 'Metabase', controller],
-        scope: {
-            sql: '=', // the text of the editor itself
-            database: '=', // int ID of DB to use for autocompletion
-            onLoad: '&onload' // optional callback of the form fn(aceEditor) in case we need a reference to it (e.g. so we can aceEditor.focus())
-        }
-    };
-});