diff --git a/attacks/Captive Portal/attack.sh b/attacks/Captive Portal/attack.sh
index 715cb21..e225ec6 100644
--- a/attacks/Captive Portal/attack.sh	
+++ b/attacks/Captive Portal/attack.sh	
@@ -116,13 +116,6 @@ function captive_portal_set_cert() {
 			*) conditional_bail; return 3;;
 		esac
 	done
-
-	# Check existance of ssl certificate with file size > 0
-	# Check again depends on the following conditional.
-	# I could move it, but I don't want to...
-	#if [ ! -f $FLUXIONWorkspacePath/server.pem -o ! -s $FLUXIONWorkspacePath/server.pem ]; then
-	#	FLUXIONNextOperation="Certificate"
-	#fi
 }
 
 
@@ -179,9 +172,9 @@ function captive_portal_set_site() {
 			captive_portal_unset_site
 			return 1;;
 		* )
-			# mkdir "$FLUXIONWorkspacePath/captive_portal" &>$FLUXIONOutputDevice
 			cp -r "$FLUXIONPath/attacks/Captive Portal/sites/$sitePath.portal" \
 				  "$FLUXIONWorkspacePath/captive_portal"
+
 			find "$FLUXIONWorkspacePath/captive_portal/" -type f -exec \
 				 sed -i -e 's/$APTargetSSID/'"$APTargetSSID"'/g' {} \;
 			find "$FLUXIONWorkspacePath/captive_portal/" -type f -exec \
@@ -356,16 +349,6 @@ if __name__ == '__main__':
 
 	chmod +x "$FLUXIONWorkspacePath/fluxion_captive_portal_dns"
 
-
-	#if [ $APRogueAuthMode = "hash" ]; then
-	#	echo "" >> $FLUXIONWorkspacePath/captive_portal_authenticator.sh
-
-	#elif [ $APRogueAuthMode = "wpa_supplicant" ]; then
-	#	echo "" >> $FLUXIONWorkspacePath/captive_portal_authenticator.sh
-
-	#fi
-
-
 	# Attack arbiter script
 	echo "\
 #!/bin/bash
@@ -580,10 +563,6 @@ echo -e \"The password was saved in "$CRed"$CaptivePortalNetLog/$APTargetSSID-$A
 
 	fi
 
-#	echo "
-# kill -INT \$(ps a | grep bash| grep flux | awk '{print \$1}') &> $FLUXIONOutputDevice\
-# " >> $FLUXIONWorkspacePath/captive_portal_authenticator.sh
-
 	chmod +x "$FLUXIONWorkspacePath/captive_portal_authenticator.sh"
 }
 
diff --git a/fluxion.sh b/fluxion.sh
index 5661eba..36bf6c3 100755
--- a/fluxion.sh
+++ b/fluxion.sh
@@ -101,21 +101,6 @@ function exitmode() {
 			airmon-ng stop $WIMonitor &> $FLUXIONOutputDevice
 		fi
 
-		#if [ "`cat /proc/sys/net/ipv4/ip_forward`" != "0" ]; then
-		#	echo -e "$CWht[$CRed-$CWht] $FLUXIONDisablingPacketForwardingNotice$CClr"
-		#	sysctl -w net.ipv4.ip_forward=0 &> $FLUXIONOutputDevice
-		#fi
-
-		#echo -e "$CWht[$CRed-$CWht] $FLUXIONDisablingCleaningIPTablesNotice$CClr"
-		#if [ ! -f "$FLUXIONWorkspacePath/iptables-rules" ];then 
-		#	iptables --flush 
-		#	iptables --table nat --flush 
-		#	iptables --delete-chain
-		#	iptables --table nat --delete-chain 
-		#else 
-		#	iptables-restore < "$FLUXIONWorkspacePath/iptables-rules"   
-		#fi
-
 		echo -e "$CWht[$CRed-$CWht] $FLUXIONRestoringTputNotice$CClr"
 		tput cnorm