Index: /modules/branches/2.7/callforward/uninstall.php
===================================================================
--- /modules/branches/2.7/callforward/uninstall.php (revision 7470)
+++ /modules/branches/2.7/callforward/uninstall.php (revision 9203)
@@ -20,5 +20,45 @@
 // is this global...? what if we include this files
 // from a function...?
+
 global $astman;
+
+// Unconditional Call Forwarding
+$fcc = new featurecode('callforward', 'cfon');
+$fcc->delete();
+unset($fcc);
+
+$fcc = new featurecode('callforward', 'cfoff');
+$fcc->delete();
+unset($fcc);
+
+$fcc = new featurecode('callforward', 'cfoff_any');
+$fcc->delete();
+unset($fcc);
+
+// Call Forward on Busy
+$fcc = new featurecode('callforward', 'cfbon');
+$fcc->delete();
+unset($fcc);
+
+$fcc = new featurecode('callforward', 'cfboff');
+$fcc->delete();
+unset($fcc);
+
+$fcc = new featurecode('callforward', 'cfboff_any');
+$fcc->delete();
+unset($fcc);
+
+// Call Forward on No Answer/Unavailable (i.e. phone not registered)
+$fcc = new featurecode('callforward', 'cfuon');
+$fcc->delete();
+unset($fcc);
+
+$fcc = new featurecode('callforward', 'cfuoff');
+$fcc->delete();
+unset($fcc);
+
+$fcc = new featurecode('callforward', 'cf_toggle');
+$fcc->delete();
+unset($fcc);
 
 // remove all Call Forward options in effect on extensions
@@ -30,4 +70,3 @@
 	fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]);
 }
-
 ?>
Index: /modules/branches/2.7/callforward/module.xml
===================================================================
--- /modules/branches/2.7/callforward/module.xml (revision 9098)
+++ /modules/branches/2.7/callforward/module.xml (revision 9203)
@@ -2,8 +2,9 @@
 	<rawname>callforward</rawname>
 	<name>Call Forward</name>
-	<version>2.7.0.3</version>
+	<version>2.7.0.4</version>
 	<publisher>FreePBX</publisher>
 	<license>GPLv2+</license>
 	<changelog>
+		*2.7.0.4* #41116
 		*2.7.0.3* #4105 again
 		*2.7.0.2* #4103, #4104, #4105