diff --git a/elisp/go-autocomplete.el b/elisp/go-autocomplete.el
deleted file mode 100644
index 9ff104a0b..000000000
--- a/elisp/go-autocomplete.el
+++ /dev/null
@@ -1,151 +0,0 @@
-;;; go-autocomplete.el --- auto-complete-mode backend for go-mode
-
-;; Copyright (C) 2010
-
-;; Author: Mikhail <tensai@cirno.in> Kuryshev
-;; Keywords: languages
-;; Package-Requires: ((auto-complete "1.4.0"))
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Ensure that go-autocomplete in your load-path and add to your ~/.emacs
-;; following line:
-;;
-;; (require 'go-autocomplete)
-
-;; Also you could setup any combination (for example M-TAB)
-;; for invoking auto-complete:
-;;
-;; (require 'auto-complete-config)
-;; (define-key ac-mode-map (kbd "M-TAB") 'auto-complete)
-
-;;; Code:
-
-(eval-when-compile
-  (require 'cl)
-  (require 'auto-complete))
-
-;; Close gocode daemon at exit unless it was already running
-(eval-after-load "go-mode"
-  '(progn
-     (let* ((user (or (getenv "USER") "all"))
-            (sock (format (concat temporary-file-directory "gocode-daemon.%s") user)))
-       (unless (file-exists-p sock)
-         (add-hook 'kill-emacs-hook #'(lambda ()
-                                        (ignore-errors
-                                          (call-process "gocode" nil nil nil "close"))))))))
-
-;(defvar go-reserved-keywords
-;  '("break" "case" "chan" "const" "continue" "default" "defer" "else"
-;    "fallthrough" "for" "func" "go" "goto" "if" "import" "interface"
-;    "map" "package" "range" "return" "select" "struct" "switch" "type" "var")
-;  "Go reserved keywords.")
-
-(defun ac-comphist-sort (db collection prefix &optional threshold)
-;; redefine to disable sorting
-  (let (result
-        (n 0)
-        (total 0)
-        (cur 0))
-    (setq result (mapcar (lambda (a)
-                           (when (and cur threshold)
-                             (if (>= cur (* total threshold))
-                                 (setq cur nil)
-                               (incf n)
-                               (incf cur (cdr a))))
-                           (car a))
-                         (mapcar (lambda (string)
-				   (let ((score (ac-comphist-score db string prefix)))
-				     (incf total score)
-				     (cons string score)))
-				 collection)))
-    (if threshold
-        (cons n result)
-      result)))
-
-(defun ac-go-invoke-autocomplete ()
-  (let ((temp-buffer (generate-new-buffer "*gocode*")))
-    (unwind-protect
-        (progn
-          (call-process-region (point-min)
-                               (point-max)
-                               "gocode"
-                               nil
-                               temp-buffer
-                               nil
-                               "-f=emacs"
-                               "autocomplete"
-                               (or (buffer-file-name) "")
-                               (concat "c" (int-to-string (- (point) 1))))
-          (with-current-buffer temp-buffer (buffer-string)))
-      (kill-buffer temp-buffer))))
-
-(defun ac-go-format-autocomplete (buffer-contents)
-  (sort
-   (split-string buffer-contents "\n" t)
-   (lambda (a b) (string< (downcase a)
-                          (downcase b)))))
-
-(defun ac-go-get-candidates (strings)
-  (let ((prop (lambda (entry)
-		(let ((name (nth 0 entry))
-		      (summary (nth 1 entry)))
-		  (propertize name
-			      'summary summary))))
-	(split (lambda (strings)
-		 (mapcar (lambda (str)
-			   (split-string str ",," t))
-			 strings))))
-    (mapcar prop (funcall split strings))))
-
-(defun ac-go-action ()
-  (let ((item (cdr ac-last-completion)))
-    (if (stringp item)
-        (message "%s" (get-text-property 0 'summary item)))))
-
-(defun ac-go-document (item)
-  (if (stringp item)
-      (let ((s (get-text-property 0 'summary item)))
-        (message "%s" s)
-        nil)))
-
-(defun ac-go-candidates ()
-  (ac-go-get-candidates (ac-go-format-autocomplete (ac-go-invoke-autocomplete))))
-
-(defun ac-go-prefix ()
-  (or (ac-prefix-symbol)
-      (let ((c (char-before)))
-        (when (eq ?\. c)
-          (point)))))
-
-(ac-define-source go
-  '((candidates . ac-go-candidates)
-    (candidate-face . ac-candidate-face)
-    (selection-face . ac-selection-face)
-    (document . ac-go-document)
-    (action . ac-go-action)
-    (prefix . ac-go-prefix)
-    (requires . 0)
-    (cache)
-    (symbol . "g")))
-
-(add-to-list 'ac-modes 'go-mode)
-
-(add-hook 'go-mode-hook #'(lambda ()
-                           (add-to-list 'ac-sources 'ac-source-go)))
-
-(provide 'go-autocomplete)
-;;; go-autocomplete.el ends here
diff --git a/elisp/shaderlab-mode.el b/elisp/shaderlab-mode.el
index 0755ca01d..a83706ab8 100644
--- a/elisp/shaderlab-mode.el
+++ b/elisp/shaderlab-mode.el
@@ -312,7 +312,7 @@ See also `shaderlab-font-lock-extra-types'.")
 						  (setq cur-indent (current-indentation))
 						  (setq looking-for-line nil))
 						 ((not (looking-at regexp-empty-line))
-						  (setq cur-indent (- (current-indentation) default-tab-width))
+						  (setq cur-indent (- (current-indentation) tab-width))
 						  (setq looking-for-line nil))))))
 						 
 			 (when (< cur-indent 0) ; We can't indent past the left margin
@@ -329,7 +329,7 @@ See also `shaderlab-font-lock-extra-types'.")
 						  (setq not-indented nil))
 						 ((looking-at regexp-opening-brace) ; This hint indicates that we need to indent an extra level
 						  ;(message "Found opening brace at %s" (what-line))
-						  (setq cur-indent (+ (current-indentation) default-tab-width)) ; Do the actual indenting
+						  (setq cur-indent (+ (current-indentation) tab-width)) ; Do the actual indenting
 						  (setq not-indented nil))
 						 ((bobp)
 						   (setq not-indented nil)))))))