diff --git a/build/envsetup.sh b/build/envsetup.sh
index 2ea5fe6c..078c9806 100644
--- a/build/envsetup.sh
+++ b/build/envsetup.sh
@@ -5,8 +5,6 @@ Additional LineageOS functions:
 - mmp:             Builds all of the modules in the current directory and pushes them to the device.
 - mmap:            Builds all of the modules in the current directory and its dependencies, then pushes the package to the device.
 - mmmp:            Builds all of the modules in the supplied directories and pushes them to the device.
-- mms:             Short circuit builder. Quickly re-build the kernel, rootfs, boot and system images
-                   without deep dependencies. Requires the full build to have run before.
 - lineagegerrit:   A Git wrapper that fetches/pushes patch from/to LineageOS Gerrit Review.
 - lineagerebase:   Rebase a Gerrit change and push it again.
 - lineageremote:   Add git remote for LineageOS Gerrit Review.
@@ -710,29 +708,6 @@ function cmka() {
     fi
 }
 
-function mms() {
-    local T=$(gettop)
-    if [ -z "$T" ]
-    then
-        echo "Couldn't locate the top of the tree.  Try setting TOP."
-        return 1
-    fi
-
-    case `uname -s` in
-        Darwin)
-            local NUM_CPUS=$(sysctl hw.ncpu|cut -d" " -f2)
-            ONE_SHOT_MAKEFILE="__none__" \
-                make -C $T -j $NUM_CPUS "$@"
-            ;;
-        *)
-            local NUM_CPUS=$(grep "^processor" /proc/cpuinfo | wc -l)
-            ONE_SHOT_MAKEFILE="__none__" \
-                mk_timer schedtool -B -n 1 -e ionice -n 1 \
-                make -C $T -j $NUM_CPUS "$@"
-            ;;
-    esac
-}
-
 function repolastsync() {
     RLSPATH="$ANDROID_BUILD_TOP/.repo/.repo_fetchtimes.json"
     RLSLOCAL=$(date -d "$(stat -c %z $RLSPATH)" +"%e %b %Y, %T %Z")