diff --git a/.emacs b/.emacs
index 1f86acbb..00b576d5 100644
--- a/.emacs
+++ b/.emacs
@@ -4,13 +4,15 @@
 ;; 2013-01-09
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;; Main should be loaded first.
-(load "~/.emacs.d/main.el" nil t)
+(add-to-list 'load-path "~/.emacs.d/")
 
-(load "~/.emacs.d/theme.el" nil t)
-(load "~/.emacs.d/modes.el" nil t)
-(load "~/.emacs.d/functions.el" nil t)
-(load "~/.emacs.d/plugins.el" nil t)
+;; Main should be loaded first.
+(load "main" nil t)
+
+(load "theme" nil t)
+(load "modes" nil t)
+(load "functions" nil t)
+;; (load "plugins" nil t)
 
 ;; End of file
 
diff --git a/.emacs.d/functions.el b/.emacs.d/functions.el
index 872b98e8..ab609074 100644
--- a/.emacs.d/functions.el
+++ b/.emacs.d/functions.el
@@ -18,10 +18,10 @@
 
 ;; Remove duplicate lines. (sort -u)
 ;; TODO: finish it.
-(defun remove-duplicates ()
-  (interactive)
-  ((shell-command (echo blah)))
-)
+;; (defun remove-duplicates ()
+;;   (interactive)
+;;   ((shell-command (echo blah)))
+;; )
 
 ;;==============================================================================
 ;; Toggle window split
diff --git a/.emacs.d/plugins.el b/.emacs.d/plugins.el
index ef3fbadf..793797de 100644
--- a/.emacs.d/plugins.el
+++ b/.emacs.d/plugins.el
@@ -2,9 +2,6 @@
 ;; PLUGINS
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;; User plugin path.
-;; (add-to-list 'load-path "~/.emacs.d/plugins")
-
 ;;==============================================================================
 ;; Yasnippet
 ;;==============================================================================