diff --git a/query_delete.php b/query_delete.php
deleted file mode 100644
index 5baa183b36..0000000000
--- a/query_delete.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-# MantisBT - A PHP based bugtracking system
-
-# MantisBT is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# MantisBT is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with MantisBT.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Handler to delete a stored query.
- *
- * Takes source_query_id as a parameter
- *
- * @package MantisBT
- * @copyright Copyright 2000 - 2002  Kenzaburo Ito - kenito@300baud.org
- * @copyright Copyright 2002  MantisBT Team - mantisbt-dev@lists.sourceforge.net
- * @link http://www.mantisbt.org
- *
- * @deprecated This page has been replaced by 'manage_filter_delete.php'
- *
- * @uses core.php
- * @uses authentication_api.php
- * @uses compress_api.php
- * @uses filter_api.php
- * @uses form_api.php
- * @uses gpc_api.php
- * @uses html_api.php
- * @uses lang_api.php
- * @uses print_api.php
- */
-
-require_once( 'core.php' );
-require_api( 'authentication_api.php' );
-require_api( 'compress_api.php' );
-require_api( 'filter_api.php' );
-require_api( 'form_api.php' );
-require_api( 'gpc_api.php' );
-require_api( 'html_api.php' );
-require_api( 'lang_api.php' );
-require_api( 'print_api.php' );
-
-# Trigger deprecate warning
-error_parameters( 'query_delete.php', 'manage_filter_delete.php' );
-trigger_error( ERROR_DEPRECATED_SUPERSEDED, DEPRECATED );
-
-form_security_validate( 'query_delete' );
-
-auth_ensure_user_authenticated();
-compress_enable();
-
-$f_query_id = gpc_get_int( 'source_query_id' );
-$t_redirect_url = 'query_view_page.php';
-
-if( !filter_db_can_delete_filter( $f_query_id ) ) {
-	print_header_redirect( $t_redirect_url );
-} else {
-	$t_message = sprintf(
-		lang_get( 'query_deleted' ),
-		filter_db_get_name( $f_query_id )
-	);
-
-	layout_page_header();
-	layout_page_begin();
-	filter_db_delete_filter( $f_query_id );
-	form_security_purge( 'query_delete' );
-	html_operation_successful( $t_redirect_url, $t_message );
-	layout_page_end();
-}
diff --git a/query_delete_page.php b/query_delete_page.php
deleted file mode 100644
index 8b43fde00b..0000000000
--- a/query_delete_page.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-# MantisBT - A PHP based bugtracking system
-
-# MantisBT is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# MantisBT is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with MantisBT.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Displays page to allow a user delete a stored query
- *
- * @package MantisBT
- * @copyright Copyright 2000 - 2002  Kenzaburo Ito - kenito@300baud.org
- * @copyright Copyright 2002  MantisBT Team - mantisbt-dev@lists.sourceforge.net
- * @link http://www.mantisbt.org
- *
- * @deprecated This page has been replaced by 'manage_filter_delete.php'
- *
- * @uses core.php
- * @uses authentication_api.php
- * @uses compress_api.php
- * @uses filter_api.php
- * @uses form_api.php
- * @uses gpc_api.php
- * @uses html_api.php
- * @uses lang_api.php
- * @uses print_api.php
- * @uses string_api.php
- */
-
-require_once( 'core.php' );
-require_api( 'authentication_api.php' );
-require_api( 'compress_api.php' );
-require_api( 'filter_api.php' );
-require_api( 'form_api.php' );
-require_api( 'gpc_api.php' );
-require_api( 'html_api.php' );
-require_api( 'lang_api.php' );
-require_api( 'print_api.php' );
-require_api( 'string_api.php' );
-
-# Trigger deprecate warning
-error_parameters( 'query_delete_page.php', 'manage_filter_delete.php' );
-trigger_error( ERROR_DEPRECATED_SUPERSEDED, DEPRECATED );
-
-auth_ensure_user_authenticated();
-compress_enable();
-
-$f_query_id = gpc_get_int( 'source_query_id' );
-$t_redirect_url = 'query_view_page.php';
-$t_delete_url = 'query_delete.php';
-
-if( !filter_db_can_delete_filter( $f_query_id ) ) {
-	print_header_redirect( $t_redirect_url );
-}
-
-layout_page_header();
-
-layout_page_begin();
-?>
-
-<div class="col-md-12 col-xs-12">
-<div class="space-10"></div>
-<div class="alert alert-warning center">
-    <p class="bigger-110">
-        <?php echo lang_get( 'query_delete_msg' ); ?>
-        <div class="space-4"></div>
-        <strong><?php print string_display( filter_db_get_name( $f_query_id ) ); ?></strong>
-    </p>
-    <div class="space-10"></div>
-    <div class="col-md-6 col-xs-6 no-padding">
-    <form method="post" action="<?php print $t_delete_url; ?>" class="pull-right">
-        <?php echo form_security_field( 'query_delete' ) ?>
-        <input type="hidden" name="source_query_id" value="<?php print $f_query_id; ?>"/>
-        <input type="submit" class="btn btn-primary btn-white btn-round" value="<?php print lang_get( 'delete_query' ); ?>"/>
-    </form>
-    </div>
-    <div class="col-md-6 col-xs-6 no-padding">
-    <form method="post" action="<?php print $t_redirect_url; ?>" class="pull-left">
-        <?php # CSRF protection not required here - form does not result in modifications ?>
-        <input type="submit" class="btn btn-primary btn-white btn-round" value="<?php print lang_get( 'go_back' ); ?>"/>
-    </form>
-    </div>
-    <div class="clearfix"></div>
-</div>
-</div>
-
-<?php
-layout_page_end();
diff --git a/query_view_page.php b/query_view_page.php
deleted file mode 100644
index cd9f62d395..0000000000
--- a/query_view_page.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-# MantisBT - A PHP based bugtracking system
-
-# MantisBT is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# MantisBT is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with MantisBT.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Query View Page
- *
- * @package MantisBT
- * @copyright Copyright 2000 - 2002  Kenzaburo Ito - kenito@300baud.org
- * @copyright Copyright 2002  MantisBT Team - mantisbt-dev@lists.sourceforge.net
- * @link http://www.mantisbt.org
- *
- * @deprecated This page has been replaced by 'manage_filter_page.php'
- *
- * @uses core.php
- * @uses authentication_api.php
- * @uses compress_api.php
- * @uses config_api.php
- * @uses database_api.php
- * @uses filter_api.php
- * @uses helper_api.php
- * @uses html_api.php
- * @uses lang_api.php
- * @uses print_api.php
- * @uses rss_api.php
- */
-
-require_once( 'core.php' );
-require_api( 'authentication_api.php' );
-require_api( 'compress_api.php' );
-require_api( 'config_api.php' );
-require_api( 'database_api.php' );
-require_api( 'filter_api.php' );
-require_api( 'helper_api.php' );
-require_api( 'html_api.php' );
-require_api( 'lang_api.php' );
-require_api( 'print_api.php' );
-require_api( 'rss_api.php' );
-
-# Trigger deprecate warning
-error_parameters( 'query_view_page.php', 'manage_filter_page.php' );
-trigger_error( ERROR_DEPRECATED_SUPERSEDED, DEPRECATED );
-
-auth_ensure_user_authenticated();
-
-$t_query_arr = filter_db_get_available_queries();
-
-# Special case: if we've deleted our last query, we have nothing to show here.
-if( count( $t_query_arr ) < 1 ) {
-	print_header_redirect( 'view_all_bug_page.php' );
-}
-
-compress_enable();
-
-layout_page_header();
-
-layout_page_begin();
-
-$t_rss_enabled = config_get( 'rss_enabled' );
-?>
-<div class="col-md-12 col-xs-12">
-<div class="widget-box widget-color-blue2">
-<div class="widget-header widget-header-small">
-<h4 class="widget-title lighter">
-<i class="ace-icon fa fa-filter"></i>
-<?php echo lang_get( 'open_queries' ) ?>
-</h4>
-</div>
-
-<div class="widget-body">
-<div class="widget-main no-padding">
-
-<div class="table-responsive">
-<table class="table table-bordered table-condensed table-striped">
-<?php
-$t_column_count = 0;
-$t_max_column_count = 2;
-
-foreach( $t_query_arr as $t_id => $t_name ) {
-	if( $t_column_count == 0 ) {
-		echo '<tr>';
-	}
-
-	echo '<td class="width-50">';
-
-	if( OFF != $t_rss_enabled ) {
-		# Use the "new" RSS link style.
-		print_rss( rss_get_issues_feed_url( null, null, $t_id ), lang_get( 'rss' ) );
-		echo ' ';
-	}
-
-	$t_query_id = (int)$t_id;
-	print_link( 'view_all_set.php?type=3&source_query_id=' . $t_query_id, $t_name );
-
-	if( filter_db_can_delete_filter( $t_id ) ) {
-		echo ' <div class="pull-right">';
-		print_form_button( 'query_delete_page.php?source_query_id=' . $t_query_id, lang_get( 'delete_query' ) );
-        echo ' </div>';
-	}
-
-	echo '</td>';
-
-	$t_column_count++;
-	if( $t_column_count == $t_max_column_count ) {
-		print '</tr>';
-		$t_column_count = 0;
-	}
-}
-
-# Tidy up this row
-if( ( $t_column_count > 0 ) && ( $t_column_count < $t_max_column_count ) ) {
-	for( $i = $t_column_count; $i < $t_max_column_count; $i++ ) {
-		print '<td>&#160;</td>';
-	}
-	print '</tr>';
-}
-?>
-</table>
-</div>
-</div>
-</div>
-</div>
-</div>
-<?php
-layout_page_end();