diff --git a/conf.default/config.xml b/conf.default/config.xml
index d1778da96c..2dde636397 100644
--- a/conf.default/config.xml
+++ b/conf.default/config.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0"?>
 <!-- pfSense default system configuration -->
 <pfsense>
-	<version>2.0</version>
+	<version>2.1</version>
 	<lastchange></lastchange>
 	<theme>metallic</theme>
 	<system>
 		<enablesshd/>
 		<optimization>normal</optimization>
-		<schedulertype>priq</schedulertype>
 		<hostname>pfSense</hostname>
 		<domain>local</domain>
 		<dnsserver></dnsserver>
@@ -387,6 +386,7 @@
 	</filter>
 	<shaper>
 		<!-- <enable/> -->
+		<!-- <schedulertype>hfsc</schedulertype> -->
 		<!-- rule syntax:
 		<rule>
 			<disabled/>
diff --git a/usr/local/www/firewall_shaper_queues_edit.php b/usr/local/www/firewall_shaper_queues_edit.php
index 1404ac4fa4..9ab2fe5aa7 100755
--- a/usr/local/www/firewall_shaper_queues_edit.php
+++ b/usr/local/www/firewall_shaper_queues_edit.php
@@ -240,7 +240,7 @@ include("head.inc");
 		<input type="checkbox" id="rio" name="rio" <?php if($rio) echo " CHECKED";?> > <a target="_new" href="http://www.openbsd.org/faq/pf/queueing.html#red">Random Early Detection In and Out</a><br>
 		<input type="checkbox" id="ecn" name="ecn" <?php if($ecn) echo " CHECKED";?> > <a target="_new" href="http://www.openbsd.org/faq/pf/queueing.html#ecn">Explicit Congestion Notification</a><br>
 	<?php if ($schedulertype == "hfsc" or $schedulertype == "cbq"): ?>
-		<input type="checkbox" id="parentqueue" name="parentqueue" <?php if($parentqueue) echo " CHECKED";?> > This is a parent queue of HFSC/CBQ<br>
+		<input type="checkbox" id="parentqueue" name="parentqueue" <?php if($parentqueue) echo " CHECKED";?> > This is a parent queue<br>
 	<?php endif; ?>
 	<span class="vexpl"><br>Select options for this queue
 	</tr>
@@ -267,7 +267,7 @@ include("head.inc");
 	
 	<?php if ($schedulertype == "hfsc" or $schedulertype == "cbq"): ?>
 	    <tr>
-		<td width="22%" valign="top" class="vncell">Parent queue (CBQ or HFSC only):</td>
+		<td width="22%" valign="top" class="vncell">Parent queue:</td>
 		<td width="78%" class="vtable">
 		   <select id="attachtoqueue" name="attachtoqueue">
 			<?php
diff --git a/usr/local/www/system_advanced.php b/usr/local/www/system_advanced.php
index ef71a9ed78..a71c0ac856 100755
--- a/usr/local/www/system_advanced.php
+++ b/usr/local/www/system_advanced.php
@@ -476,6 +476,7 @@ include("head.inc");
 				<br />
 			</td>
 		</tr>
+<!---
 		<tr>
 			<td width="22%" valign="top" class="vncell">Traffic Shaper Scheduler</td>
 			<td width="78%" class="vtable">
@@ -495,6 +496,7 @@ include("head.inc");
 				<?php endif; ?>
 			</td>
 		</tr>
+-->
 		<tr>
 			<td width="22%" valign="top" class="vncell">Firewall Optimization Options</td>
 			<td width="78%" class="vtable">