diff --git a/cfg/zsh/cfg.d/export.zsh b/cfg/zsh/cfg.d/export.zsh
index 244ebec..86ce0b0 100644
--- a/cfg/zsh/cfg.d/export.zsh
+++ b/cfg/zsh/cfg.d/export.zsh
@@ -11,18 +11,15 @@ BASHER_ROOT=/home/eeleater/.basher
 path=(${brewpr}/sbin ${brewpr}/bin)			 			  # Homebrew
 path+=(/usr/local/sbin /usr/local/bin)			 			  # Local Bin
 path+=(/usr/sbin /usr/bin)				 			  # /usr/bin
-if type apt-get &>/dev/null; then path+=(/sbin /bin); fi 			  # /bin only on Debian
 path+=(${dotfls}/bin)					 			  # Bin in Dotfiles
 path+=(${dotlib}/basher/bin ${BASHER_ROOT}/cellar/bin)   			  # Basher
 path+=(${gembin})					 			  # Ruby Gems
 path+=(/usr/lib/jvm/default/bin)			 			  # Java
-if type pacman &>/dev/null; then
-	if pacman -Qm android-sdk-build-tools &>/dev/null; then
-		asdkver="$(pacman -Qm android-sdk-build-tools | awk '{print $2}' | cut -d'-' -f1 | cut -d'r' -f2)"
-		path+=(/opt/android-sdk/build-tools/${asdkver}); # Android SDK
-	fi
-	path+=(/opt/phalcon-devtools)
+if pacman -Qm android-sdk-build-tools &>/dev/null; then
+	asdkver="$(pacman -Qm android-sdk-build-tools | awk '{print $2}' | cut -d'-' -f1 | cut -d'r' -f2)"
+	path+=(/opt/android-sdk/build-tools/${asdkver}); # Android SDK
 fi
+path+=(/opt/phalcon-devtools)
 
 PTOOLSPATH="/opt/phalcon-devtools/"
 
diff --git a/cfg/zsh/cfg.d/source.d/alias-os.zsh b/cfg/zsh/cfg.d/source.d/alias-os.zsh
index e8564bf..7aa2dea 100644
--- a/cfg/zsh/cfg.d/source.d/alias-os.zsh
+++ b/cfg/zsh/cfg.d/source.d/alias-os.zsh
@@ -73,83 +73,3 @@ if type pacman &>/dev/null; then
 		done
 	}
 fi
-
-if type apt-get &>/dev/null; then
-	apt_pref='apt-get'
-	apt_upgr='upgrade'
-
-	if [[ -e $( which -p sudo 2>&1 ) ]]; then use_sudo=1; fi
-
-	alias age='apt-get'
-	alias acs="apt-cache search"
-	alias afs='apt-file search --regexp'
-	alias asrc='apt-get source'
-	alias app='apt-cache policy'
-
-	alias aac='sudo apt-get autoclean'
-	alias abd='sudo apt-get build-dep'
-	alias ac='sudo apt-get clean'
-	alias ad='sudo apt-get update'
-	alias adg='sudo apt-get update && sudo apt-get upgrade'
-	alias adu='sudo apt-get update && sudo apt-get dist-upgrade'
-	alias afu='sudo apt-file update'
-	alias ag='sudo apt-get upgrade'
-	alias ai='sudo apt-get install'
-	alias ail="sed -e 's/  */ /g' -e 's/ *//' | cut -s -d ' ' -f 1 | "' xargs sudo apt-get install'
-	alias ap='sudo apt-get purge'
-	alias ar='sudo apt-get remove'
-	alias ads='sudo apt-get dselect-upgrade'
-	alias dia='sudo dpkg -i ./*.deb'
-	alias di='sudo dpkg -i'
-
-	apt_pref_compdef() {
-		local f fb
-		f="_apt_pref_${2}"
-
-		eval "function ${f}() {
-			shift words;
-			service=\"apt-get\";
-			words=(\"apt-get\" '$2' \$words);
-			((CURRENT++))
-			_apt
-			}"
-		compdef "$f" "$1"
-	}
-
-	apt_pref_compdef aac "autoclean"
-	apt_pref_compdef abd "build-dep"
-	apt_pref_compdef ac  "clean"
-	apt_pref_compdef ad  "update"
-	apt_pref_compdef afu "update"
-	apt_pref_compdef ag  "upgrade"
-	apt_pref_compdef ai  "install"
-	apt_pref_compdef ail "install"
-	apt_pref_compdef ap  "purge"
-	apt_pref_compdef ar  "remove"
-	apt_pref_compdef ads "dselect-upgrade"
-
-	apt-history () {
-		case "$1" in
-			install)
-				zgrep --no-filename 'install ' $(ls -rt /var/log/dpkg*)
-				;;
-			upgrade|remove)
-				zgrep --no-filename $1 $(ls -rt /var/log/dpkg*)
-				;;
-			rollback)
-				zgrep --no-filename upgrade $(ls -rt /var/log/dpkg*) | grep "$2" -A10000000 | grep "$3" -B10000000 | awk '{print $4"="$5}'
-				;;
-			list)
-				zgrep --no-filename '' $(ls -rt /var/log/dpkg*)
-				;;
-			*)
-				echo "Parameters:"
-				echo " install - Lists all packages that have been installed."
-				echo " upgrade - Lists all packages that have been upgraded."
-				echo " remove - Lists all packages that have been removed."
-				echo " rollback - Lists rollback information."
-				echo " list - Lists all contents of dpkg logs."
-				;;
-		esac
-	}
-fi
diff --git a/cfg/zsh/cfg.d/source.d/completion-exercism.zsh b/cfg/zsh/cfg.d/source.d/completion-exercism.zsh
deleted file mode 100644
index 99abaf3..0000000
--- a/cfg/zsh/cfg.d/source.d/completion-exercism.zsh
+++ /dev/null
@@ -1,39 +0,0 @@
-_exercism() {
-    local curcontext="$curcontext" state line
-    typeset -A opt_args
-
-    local -a options
-    options=(debug:"Outputs useful debug information."
-             configure:"Writes config values to a JSON file."
-             demo:"Fetches a demo problem for each language track on exercism.io."
-             fetch:"Fetches your current problems on exercism.ios well as the next unstarted problem in each language."
-             restore:"Restores completed and current problems on from exercism.iolong with your most recent iteration for each."
-             submit:"Submits a new iteration to a problem on exercism.io."
-             unsubmit:"Deletes the most recently submitted iteration."
-             tracks:"List the available language tracks"
-             download:"Downloads and saves a specified submission into the local system"
-             help:"Shows a list of commands or help for one command")
-
-    _arguments -s -S \
-        {-c,--config}"[path to config file]"    \
-        {-d,--debug}"[turn on verbose logging]" \
-        {-h,--help}"[show help]"                \
-        {-v,--version}"[print the version]"     \
-        '(-): :->command'                       \
-        '*: :'                                  \
-        && return 0;
-
-    case $state in
-        (command)
-            _describe 'commands' options ;;
-        *)
-        case $words[2] in
-            *submit)
-                _files
-                ;;
-        esac
-    esac
-}
-
-compdef '_exercism' exercism
-
diff --git a/cfg/zsh/cfg.d/source.d/function-cnf.zsh b/cfg/zsh/cfg.d/source.d/function-cnf.zsh
index 2a1d84d..291ed00 100644
--- a/cfg/zsh/cfg.d/source.d/function-cnf.zsh
+++ b/cfg/zsh/cfg.d/source.d/function-cnf.zsh
@@ -1,2 +1 @@
-[[ -e /etc/zsh_command_not_found ]] && source /etc/zsh_command_not_found
 [[ -e /usr/share/doc/pkgfile/command-not-found.zsh ]] && source /usr/share/doc/pkgfile/command-not-found.zsh