diff --git a/powerwall.sh b/powerwall.sh
index 1d011743..9a6b4f17 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -601,14 +601,11 @@ CHECKPOWER(){
 				watts=$(cat ${hostfile})
 				# echo -e "${idsCL[LightCyan]}HOST '${PW_iDRACHOST_SHORTNAMES[${host}]}'     ${idsCL[Default]}: ${idsCL[Green]}${watts}W${idsCL[Default]}"
 				echo -e "${idsCL[LightCyan]}HOST '${host}'     ${idsCL[Default]}: ${idsCL[Green]}${watts}W${idsCL[Default]}"
-				rm -f ${hostfile}
 			fi
 		done
-		if [ -f ${PW_TMPFOLDER}/done.hostpower ]; then
-			checked=done
-			rm -f ${PW_TMPFOLDER}/done.hostpower
-		fi
+		[ -f ${PW_TMPFOLDER}/done.hostpower ] && checked=done
 	done
+	rm -f ${PW_TMPFOLDER}/*.hostpower
 		
 	[ "${action}" != "" ] && echo
 }