diff --git a/Makefile b/Makefile
index 3445159..8c5766e 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,6 @@ FLAVOUR?=	OpenSSL
 _ARCH!=		uname -p
 ARCH?=		${_ARCH}
 KERNEL?=	SMP
-QUICK?=		#yes
 ADDITIONS?=	os-dyndns${SUFFIX}
 DEVICE?=	A10
 SPEED?=		115200
@@ -150,7 +149,7 @@ ${STEP}: lint-steps
 	    -m ${MIRRORS:Ox:[1]} -o "${STAGEDIRPREFIX}" -c ${SPEED} \
 	    -b ${SRCBRANCH} -B ${PORTSBRANCH} -e ${PLUGINSBRANCH} \
 	    -g ${TOOLSBRANCH} -E ${COREBRANCH} -G ${PORTSREFBRANCH} \
-	    -H "${COREENV}" -Q "${QUICK}" -u "${UEFI:tl}" -U "${SUFFIX}" \
+	    -H "${COREENV}" -u "${UEFI:tl}" -U "${SUFFIX}" \
 	    -V "${ADDITIONS}" -O "${GITBASE}"  -r "${SERVER}" \
 	    -q "${VERSIONS}" -h "${PLUGINSENV}" -I "${UPLOADDIR}" \
 	    -D "${DEVELBRANCH}" ${${STEP}_ARGS}
diff --git a/build/common.sh b/build/common.sh
index d2289e9..a923066 100644
--- a/build/common.sh
+++ b/build/common.sh
@@ -28,7 +28,7 @@
 
 set -e
 
-OPTS="a:B:b:C:c:D:d:E:e:F:f:G:g:H:h:I:K:k:L:l:m:n:O:o:P:p:Q:q:R:r:S:s:T:t:U:u:v:V:"
+OPTS="a:B:b:C:c:D:d:E:e:F:f:G:g:H:h:I:K:k:L:l:m:n:O:o:P:p:q:R:r:S:s:T:t:U:u:v:V:"
 
 while getopts ${OPTS} OPT; do
 	case ${OPT} in
@@ -122,9 +122,6 @@ while getopts ${OPTS} OPT; do
 	p)
 		export PLUGINSDIR=${OPTARG}
 		;;
-	Q)
-		export PRODUCT_QUICK=${OPTARG}
-		;;
 	q)
 		for _VERSION in ${OPTARG}; do
 			eval "export ${_VERSION}"
diff --git a/build/plugins.sh b/build/plugins.sh
index 83dc298..e709aad 100644
--- a/build/plugins.sh
+++ b/build/plugins.sh
@@ -38,22 +38,13 @@ cat ${CONFIGDIR}/plugins.conf | while read PLUGIN_ORIGIN PLUGIN_IGNORE; do
 		continue
 	fi
 	if [ -n "${PLUGIN_IGNORE}" ]; then
-		QUICK=
 		for PLUGIN_QUIRK in $(echo ${PLUGIN_IGNORE} | tr ',' ' '); do
 			if [ ${PLUGIN_QUIRK} = ${PRODUCT_TARGET} -o \
 			     ${PLUGIN_QUIRK} = ${PRODUCT_ARCH} -o \
 			     ${PLUGIN_QUIRK} = ${PRODUCT_FLAVOUR} ]; then
 				continue 2
 			fi
-			if [ ${PLUGIN_QUIRK} = "quick" ]; then
-				QUICK=1
-			fi
 		done
-		if [ -n "${PRODUCT_QUICK}" -a -z "${QUICK}" ]; then
-			# speed up build by skipping all annotations,
-			# our core should work without all of them.
-			continue
-		fi
 	fi
 	echo ${PLUGIN_ORIGIN}
 done
diff --git a/build/ports.sh b/build/ports.sh
index 6d35e34..a932157 100644
--- a/build/ports.sh
+++ b/build/ports.sh
@@ -39,22 +39,13 @@ cat ${CONFIGDIR}/ports.conf | while read PORT_ORIGIN PORT_IGNORE; do
 		continue
 	fi
 	if [ -n "${PORT_IGNORE}" ]; then
-		QUICK=
 		for PORT_QUIRK in $(echo ${PORT_IGNORE} | tr ',' ' '); do
 			if [ ${PORT_QUIRK} = ${PRODUCT_TARGET} -o \
 			     ${PORT_QUIRK} = ${PRODUCT_ARCH} -o \
 			     ${PORT_QUIRK} = ${PRODUCT_FLAVOUR} ]; then
 				continue 2
 			fi
-			if [ ${PORT_QUIRK} = "quick" ]; then
-				QUICK=1
-			fi
 		done
-		if [ -n "${PRODUCT_QUICK}" -a -z "${QUICK}" ]; then
-			# speed up build by skipping all annotations,
-			# our core should work without all of them.
-			continue
-		fi
 	fi
 	echo ${PORT_ORIGIN}
 done
diff --git a/config/19.1/ports.conf b/config/19.1/ports.conf
index 02d19b5..94a90ab 100644
--- a/config/19.1/ports.conf
+++ b/config/19.1/ports.conf
@@ -1,7 +1,7 @@
 #ORIGIN						IGNORE
 archivers/php${PRODUCT_PHP}-zlib
 archivers/zip
-audio/beep					arm,arm64,quick
+audio/beep					arm,arm64
 benchmarks/iperf3				arm,arm64
 benchmarks/stress-ng				arm,arm64
 comms/gnokii					arm,arm64
@@ -143,7 +143,7 @@ net/vnstat					arm,arm64
 net/wireguard					arm,arm64,i386
 net/wol
 net/zerotier					arm,arm64
-opnsense/bsdinstaller				arm,arm64,quick
+opnsense/bsdinstaller				arm,arm64
 opnsense/cpustats
 opnsense/dhcp6c
 opnsense/dhcpleases