diff --git a/lib/docker.sh b/lib/docker.sh
index 3a60f38..4893465 100644
--- a/lib/docker.sh
+++ b/lib/docker.sh
@@ -205,9 +205,6 @@ docker_build_image() {
 			-f "${dockerfile}" \
 			"${DOCKER_DIR}" || return 1
 	fi
-
-	# FIXME uncomment
-	# docker system prune -f
 }
 
 FB_FUNC_NAMES+=('docker_save_image')
@@ -272,11 +269,7 @@ docker_run_image() {
 		"${DOCKER_RUN_FLAGS[@]}" \
 		-u "$(id -u):$(id -g)" \
 		"${image_tag}" \
-		"${runCmd[@]}" || return 1
-
-	docker system prune -f
-
-	return 0
+		"${runCmd[@]}"
 }
 
 FB_FUNC_NAMES+=('build_with_docker')
diff --git a/lib/utils.sh b/lib/utils.sh
index 10b9740..f12b102 100644
--- a/lib/utils.sh
+++ b/lib/utils.sh
@@ -347,12 +347,10 @@ spinner() {
 	local spinPidFile="${TMP_DIR}/.spinner-pid"
 	case "${action}" in
 	start)
-		test -f "${spinPidFile}" &&
-			rm "${spinPidFile}"
+		test -f "${spinPidFile}" && rm "${spinPidFile}"
 
 		# don't want to clutter logs if running headless
-		test "${HEADLESS}" == '1' &&
-			return
+		test "${HEADLESS}" == '1' && return
 
 		_start_spinner &
 		echo $! >"${spinPidFile}"