diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 84a850ca39a28e9442ea035ce4ea3f007d777962..0c85de714aa84c86cbc0869875c3915f9d90c7fe 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -10,14 +10,23 @@ for config_file ($ZSH/lib/*.zsh) source $config_file
 # Load all of your custom configurations from custom/
 for config_file ($ZSH/custom/*.zsh) source $config_file
 
-# Load all of the plugins that were defined in ~/.zshrc
+# Add all defined plugins to fpath
 plugin=${plugin:=()}
-for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
+for plugin ($plugins) fpath=($ZSH/plugins/$plugin $fpath)
 
 # Load and run compinit
 autoload -U compinit
 compinit -i
 
+# Load all of the plugins that were defined in ~/.zshrc
+for plugin ($plugins)
+do
+  if [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]
+  then
+    source $ZSH/plugins/$plugin/$plugin.plugin.zsh
+  fi
+done
+
 # Load the theme
 source "$ZSH/themes/$ZSH_THEME.zsh-theme"
 
diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
deleted file mode 100644
index 079c0fba01ed7c52105382a10bd97a38d0bea121..0000000000000000000000000000000000000000
--- a/plugins/brew/brew.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# add brew completion function to path
-fpath=($ZSH/plugins/brew $fpath)
diff --git a/plugins/cpanm/cpanm.plugin.zsh b/plugins/cpanm/cpanm.plugin.zsh
deleted file mode 100644
index 8425b5ad88ab24b7cdcc293cb076e8a5d4f553a4..0000000000000000000000000000000000000000
--- a/plugins/cpanm/cpanm.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# add cpanm completion function to path
-fpath=($ZSH/plugins/cpanm $fpath)
diff --git a/plugins/gem/gem.plugin.zsh b/plugins/gem/gem.plugin.zsh
deleted file mode 100644
index cdfad7ad672b02ff92c86cca70e49c500c5872f7..0000000000000000000000000000000000000000
--- a/plugins/gem/gem.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# add gem completion function to path
-fpath=($ZSH/plugins/gem $fpath)
diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
deleted file mode 100644
index 0858783ccc5ae896311d494cf518965c6437f059..0000000000000000000000000000000000000000
--- a/plugins/github/github.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# add github completion function to path
-fpath=($ZSH/plugins/github $fpath)
diff --git a/plugins/macports/macports.plugin.zsh b/plugins/macports/macports.plugin.zsh
index 492a665b548b5ed0fb22142d34a89f6a45fe1b3f..277352e321afd49b954cb91223cf59f9eaf399a3 100644
--- a/plugins/macports/macports.plugin.zsh
+++ b/plugins/macports/macports.plugin.zsh
@@ -6,5 +6,3 @@ alias puni="sudo port uninstall inactive"
 alias puo="sudo port upgrade outdated"
 alias pup="psu && puo"
 
-# add macports completion function to path
-fpath=($ZSH/plugins/macports $fpath)
diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
deleted file mode 100644
index 740f962077e8ce37775c9de4e2aaf654c552aaf7..0000000000000000000000000000000000000000
--- a/plugins/pip/pip.plugin.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# add brew completion function to path
-fpath=($ZSH/plugins/pip $fpath)
diff --git a/plugins/vagrant/vagrant.plugin.zsh b/plugins/vagrant/vagrant.plugin.zsh
deleted file mode 100644
index 98d2d705c48fa26ffdca16a9ec3717f84ec98556..0000000000000000000000000000000000000000
--- a/plugins/vagrant/vagrant.plugin.zsh
+++ /dev/null
@@ -1 +0,0 @@
-fpath=($ZSH/plugins/vagrant $fpath)