diff --git a/Koha/SearchEngine/Zebra/QueryBuilder.pm b/Koha/SearchEngine/Zebra/QueryBuilder.pm
index 7913eb9496..0929516e9b 100644
--- a/Koha/SearchEngine/Zebra/QueryBuilder.pm
+++ b/Koha/SearchEngine/Zebra/QueryBuilder.pm
@@ -17,9 +17,10 @@ package Koha::SearchEngine::Zebra::QueryBuilder;
 # You should have received a copy of the GNU General Public License
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use base qw(Class::Accessor);
 use Modern::Perl;
-use Moose::Role;
+
+use base qw(Class::Accessor);
+
 use C4::Search;
 use C4::AuthoritiesMarc;
 
diff --git a/Koha/SearchEngine/Zebra/Search.pm b/Koha/SearchEngine/Zebra/Search.pm
index f20f556491..cb69e22fa2 100644
--- a/Koha/SearchEngine/Zebra/Search.pm
+++ b/Koha/SearchEngine/Zebra/Search.pm
@@ -17,10 +17,6 @@ package Koha::SearchEngine::Zebra::Search;
 # You should have received a copy of the GNU General Public License
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-# I don't think this ever worked right
-#use Moose::Role;
-#with 'Koha::SearchEngine::SearchRole';
-
 use Modern::Perl;
 
 use base qw(Class::Accessor);