diff --git a/templates/admin/quota/quota.mako b/templates/admin/quota/quota.mako
deleted file mode 100644
index 8fd9cb5132c..00000000000
--- a/templates/admin/quota/quota.mako
+++ /dev/null
@@ -1,83 +0,0 @@
-<%inherit file="/base.mako"/>
-<%namespace file="/message.mako" import="render_msg" />
-
-<%def name="javascripts()">
-    ${parent.javascripts()}
-    <script type="text/javascript">
-        $(function(){
-            $("input:text:first").focus();
-        })
-    </script>
-</%def>
-
-<%def name="render_select( name, options )">
-    <select name="${name|h}" id="${name|h}" style="min-width: 250px; height: 150px;" multiple>
-        %for option in options:
-            <option value="${option[0]|h}">${option[1]|h}</option>
-        %endfor
-    </select>
-</%def>
-
-<script type="text/javascript">
-$().ready(function() {  
-    $('#users_add_button').click(function() {
-        return !$('#out_users option:selected').remove().appendTo('#in_users');
-    });
-    $('#users_remove_button').click(function() {
-        return !$('#in_users option:selected').remove().appendTo('#out_users');
-    });
-    $('#groups_add_button').click(function() {
-        return !$('#out_groups option:selected').remove().appendTo('#in_groups');
-    });
-    $('#groups_remove_button').click(function() {
-        return !$('#in_groups option:selected').remove().appendTo('#out_groups');
-    });
-    $('form#associate_quota_user_group').submit(function() {
-        $('#in_users option').each(function(i) {
-            $(this).attr("selected", "selected");
-        });
-        $('#in_groups option').each(function(i) {
-            $(this).attr("selected", "selected");
-        });
-    });
-});
-</script>
-
-%if message:
-    ${render_msg( message, status )}
-%endif
-
-<div class="toolForm">
-    <div class="toolFormTitle">Quota '${name|h}'</div>
-    <div class="toolFormBody">
-        <form name="associate_quota_user_group" id="associate_quota_user_group" action="${h.url_for(controller='admin', action='manage_users_and_groups_for_quota', id=id )}" method="post" >
-            <div class="form-row">
-                <div style="float: left; margin-right: 10px;">
-                    <label>Users associated with '${name|h}'</label>
-                    ${render_select( "in_users", in_users )}<br/>
-                    <input type="submit" id="users_remove_button" value=">>"/>
-                </div>
-                <div>
-                    <label>Users not associated with '${name|h}'</label>
-                    ${render_select( "out_users", out_users )}<br/>
-                    <input type="submit" id="users_add_button" value="<<"/>
-                </div>
-            </div>
-            <div class="form-row">
-                <div style="float: left; margin-right: 10px;">
-                    <label>Groups associated with '${name|h}'</label>
-                    ${render_select( "in_groups", in_groups )}<br/>
-                    <input type="submit" id="groups_remove_button" value=">>"/>
-                </div>
-                <div>
-                    <label>Groups not associated with '${name|h}'</label>
-                    ${render_select( "out_groups", out_groups )}<br/>
-                    <input type="submit" id="groups_add_button" value="<<"/>
-                </div>
-            </div>
-            <div class="form-row">
-                <input type="submit" name="quota_members_edit_button" value="Save"/>
-            </div>
-        </form>
-    </div>
-</div>
diff --git a/templates/admin/quota/quota_create.mako b/templates/admin/quota/quota_create.mako
deleted file mode 100644
index c581744cfbe..00000000000
--- a/templates/admin/quota/quota_create.mako
+++ /dev/null
@@ -1,125 +0,0 @@
-<%inherit file="/base.mako"/>
-<%namespace file="/message.mako" import="render_msg" />
-
-<%def name="javascripts()">
-    ${parent.javascripts()}
-    <script type="text/javascript">
-        $(function(){
-            $("input:text:first").focus();
-        })
-    </script>
-</%def>
-
-<%def name="render_select( name, options )">
-    <select name="${name|h}" id="${name|h}" style="min-width: 250px; height: 150px;" multiple>
-        %for option in options:
-            <option value="${option[0]|h}">${option[1]|h}</option>
-        %endfor
-    </select>
-</%def>
-
-<script type="text/javascript">
-    $().ready(function() {  
-        $('#groups_add_button').click(function() {
-            return !$('#out_groups option:selected').remove().appendTo('#in_groups');
-        });
-        $('#groups_remove_button').click(function() {
-            return !$('#in_groups option:selected').remove().appendTo('#out_groups');
-        });
-        $('#users_add_button').click(function() {
-            return !$('#out_users option:selected').remove().appendTo('#in_users');
-        });
-        $('#users_remove_button').click(function() {
-            return !$('#in_users option:selected').remove().appendTo('#out_users');
-        });
-        $('form#associate_quota_group_user').submit(function() {
-            $('#in_groups option').each(function(i) {
-                $(this).attr("selected", "selected");
-            });
-            $('#in_users option').each(function(i) {
-                $(this).attr("selected", "selected");
-            });
-        });
-        //Temporary removal of select2 for inputs -- refactor this later.
-        $('select').select2("destroy");
-    });
-</script>
-
-<%
-    from galaxy.web.form_builder import SelectField
-    operation_selectfield = SelectField( 'operation' )
-    for op in ( '=', '+', '-' ):
-        selected = op == operation
-        operation_selectfield.add_option( op, op, selected )
-    default_selectfield = SelectField( 'default' )
-    selected = 'no' == default
-    default_selectfield.add_option( 'No', 'no', selected )
-    for typ in trans.app.model.DefaultQuotaAssociation.types.__dict__.values():
-        selected = typ == default
-        default_selectfield.add_option( 'Yes, ' + typ, typ, selected )
-%>
-
-%if message:
-    ${render_msg( message, status )}
-%endif
-
-<div class="toolForm">
-    <div class="toolFormTitle">Create quota</div>
-    <div class="toolFormBody">
-        <form name="associate_quota_group_user" id="associate_quota_group_user" action="${h.url_for(controller='admin', action='create_quota' )}" method="post" >
-            <div class="form-row">
-                <label>Name:</label>
-                <input  name="name" type="textfield" value="${name|h}" size=40"/>
-            </div>
-            <div class="form-row">
-                <label>Description:</label>
-                <input  name="description" type="textfield" value="${description|h}" size=40"/>
-            </div>
-            <div class="form-row">
-                <label>Amount</label>
-                <input  name="amount" type="textfield" value="${amount|h}" size=40"/>
-                <div class="toolParamHelp" style="clear: both;">
-                    Examples: "10000MB", "99 gb", "0.2T", "unlimited"
-                </div>
-            </div>
-            <div class="form-row">
-                <label>Assign, increase by amount, or decrease by amount?</label>
-                ${operation_selectfield.get_html()}
-            </div>
-            <div class="form-row">
-                <label>Is this quota a default for a class of users (if yes, what type)?</label>
-                ${default_selectfield.get_html()}
-                <div class="toolParamHelp" style="clear: both;">
-                    Warning: Any user or group associations selected below will be ignored if this quota is used as a default.
-                </div>
-            </div>
-            <div class="form-row">
-                <div style="float: left; margin-right: 10px;">
-                    <label>Users associated with new quota</label>
-                    ${render_select( "in_users", in_users )}<br/>
-                    <input type="submit" id="users_remove_button" value=">>"/>
-                </div>
-                <div>
-                    <label>Users not associated with new quota</label>
-                    ${render_select( "out_users", out_users )}<br/>
-                    <input type="submit" id="users_add_button" value="<<"/>
-                </div>
-            </div>
-            <div class="form-row">
-                <div style="float: left; margin-right: 10px;">
-                    <label>Groups associated with new quota</label>
-                    ${render_select( "in_groups", in_groups )}<br/>
-                    <input type="submit" id="groups_remove_button" value=">>"/>
-                </div>
-                <div>
-                    <label>Groups not associated with new quota</label>
-                    ${render_select( "out_groups", out_groups )}<br/>
-                    <input type="submit" id="groups_add_button" value="<<"/>
-                </div>
-            </div>
-            <div class="form-row">
-                <input type="submit" name="create_quota_button" value="Save"/>
-            </div>
-        </form>
-    </div>
-</div>
diff --git a/templates/admin/quota/quota_edit.mako b/templates/admin/quota/quota_edit.mako
deleted file mode 100644
index c437fea5e1c..00000000000
--- a/templates/admin/quota/quota_edit.mako
+++ /dev/null
@@ -1,46 +0,0 @@
-<%inherit file="/base.mako"/>
-<%namespace file="/message.mako" import="render_msg" />
-
-<%def name="javascripts()">
-    ${parent.javascripts()}
-    <script type="text/javascript">
-        $(function(){
-            $("input:text:first").focus();
-        })
-    </script>
-</%def>
-
-<%
-    from galaxy.web.form_builder import SelectField
-    operation_selectfield = SelectField( 'operation' )
-    for op in ( '=', '+', '-' ):
-        selected = op == operation
-        operation_selectfield.add_option( op, op, selected )
-%>
-
-%if message:
-    ${render_msg( message, status )}
-%endif
-
-<div class="toolForm">
-    <div class="toolFormTitle">Change quota amount</div>
-    <div class="toolFormBody">
-        <form name="library" action="${h.url_for( controller='admin', action='edit_quota' )}" method="post" >
-            <input name="id" type="hidden" value="${id}"/>
-            <div class="form-row">
-                <label>Amount</label>
-                <input  name="amount" type="textfield" value="${display_amount|h}" size=40"/>
-                <div class="toolParamHelp" style="clear: both;">
-                    Examples: "10000MB", "99 gb", "0.2T", "unlimited"
-                </div>
-            </div>
-            <div class="form-row">
-                <label>Assign, increase by amount, or decrease by amount?</label>
-                ${operation_selectfield.get_html()}
-            </div>
-            <div class="form-row">
-                <input type="submit" name="edit_quota_button" value="Save"/>
-            </div>
-        </form>
-    </div>
-</div>
diff --git a/templates/admin/quota/quota_rename.mako b/templates/admin/quota/quota_rename.mako
deleted file mode 100644
index 476518b6209..00000000000
--- a/templates/admin/quota/quota_rename.mako
+++ /dev/null
@@ -1,52 +0,0 @@
-<%inherit file="/base.mako"/>
-<%namespace file="/message.mako" import="render_msg" />
-
-<%def name="javascripts()">
-    ${parent.javascripts()}
-    <script type="text/javascript">
-        $(function(){
-            $("input:text:first").focus();
-        })
-    </script>
-</%def>
-
-%if message:
-    ${render_msg( message, status )}
-%endif
-
-<div class="toolForm">
-    <div class="toolFormTitle">Change quota name and description</div>
-    <div class="toolFormBody">
-        <form name="library" action="${h.url_for( controller='admin', action='rename_quota' )}" method="post" >
-            <div class="form-row">
-                <label>Name:</label>
-                <div style="float: left; width: 250px; margin-right: 10px;">
-                    <input type="text" name="name" value="${name|h}" size="40"/>
-                </div>
-                <div style="clear: both"></div>
-            </div>
-            <div class="form-row">
-                <label>Description:</label>
-                <div style="float: left; width: 250px; margin-right: 10px;">
-                    <input  name="description" type="textfield" value="${description|h}" size=40"/>
-                </div>
-                <div style="clear: both"></div>
-            </div>
-            <div class="form-row">
-                <div style="float: left; width: 250px; margin-right: 10px;">
-                    <input type="hidden" name="rename" value="submitted"/>
-                </div>
-                <div style="clear: both"></div>
-            </div>
-            <div class="form-row">
-                <div style="float: left; width: 250px; margin-right: 10px;">
-                    <input type="hidden" name="id" value="${id}"/>
-                </div>
-                <div style="clear: both"></div>
-            </div>
-            <div class="form-row">
-                <input type="submit" name="rename_quota_button" value="Save"/>
-            </div>
-        </form>
-    </div>
-</div>
diff --git a/templates/admin/quota/quota_set_default.mako b/templates/admin/quota/quota_set_default.mako
deleted file mode 100644
index ed64e0ad81e..00000000000
--- a/templates/admin/quota/quota_set_default.mako
+++ /dev/null
@@ -1,44 +0,0 @@
-<%inherit file="/base.mako"/>
-<%namespace file="/message.mako" import="render_msg" />
-
-<%def name="javascripts()">
-    ${parent.javascripts()}
-    <script type="text/javascript">
-        $(function(){
-            $("input:text:first").focus();
-        })
-    </script>
-</%def>
-
-<%
-    from galaxy.web.form_builder import SelectField
-    default_selectfield = SelectField( 'default' )
-    selected = 'no' == default
-    default_selectfield.add_option( 'No', 'no', selected )
-    for typ in trans.app.model.DefaultQuotaAssociation.types.__dict__.values():
-        selected = typ == default
-        default_selectfield.add_option( 'Yes, ' + typ, typ, selected )
-%>
-
-%if message:
-    ${render_msg( message, status )}
-%endif
-
-<div class="toolForm">
-    <div class="toolFormTitle">Set quota default</div>
-    <div class="toolFormBody">
-        <form name="set_quota_default" id="set_quota_default" action="${h.url_for(controller='admin', action='set_quota_default' )}" method="post" >
-            <input name="id" type="hidden" value="${id}"/>
-            <div class="form-row">
-                <label>Is this quota a default for a class of users (if yes, what type)?</label>
-                ${default_selectfield.get_html()}
-                <div class="toolParamHelp" style="clear: both;">
-                    Warning: Any users or groups associated with this quota will be disassociated.
-                </div>
-            </div>
-            <div class="form-row">
-                <input type="submit" name="set_default_quota_button" value="Save"/>
-            </div>
-        </form>
-    </div>
-</div>