diff --git a/app/models/web/page.rb b/app/models/web/page.rb
index d3927936..cdfd0da7 100644
--- a/app/models/web/page.rb
+++ b/app/models/web/page.rb
@@ -20,6 +20,8 @@ def self.null_object
     # @param name [String]
     # @return [Web::Page]
     def self.by_slug(slug)
+      return find_by(slug: slug.to_s)&.first if Rails.env.production?
+
       fetch_or_store to_key(slug) do
         find_by(slug: slug.to_s)&.first
       end
diff --git a/app/models/web/resource.rb b/app/models/web/resource.rb
index c52e0d4f..aa8f81f9 100644
--- a/app/models/web/resource.rb
+++ b/app/models/web/resource.rb
@@ -9,16 +9,11 @@ class Resource < ContentfulModel::Base
     # @param name [String]
     # @return [Web::Resource]
     def self.by_name(name)
+      return find_by(name: name.to_s).first if Rails.env.production?
+
       fetch_or_store to_key(name) do
         find_by(name: name.to_s).first
       end
     end
-
-    # @return [Array<Page::Resource]
-    def self.ordered
-      fetch_or_store to_key("#{name}.__method__") do
-        limit(1_000).order(:name).load.to_a
-      end
-    end
   end
 end
diff --git a/spec/features/admin/user_admin_page_spec.rb b/spec/features/admin/user_admin_page_spec.rb
index b75d8e6c..87a641ea 100644
--- a/spec/features/admin/user_admin_page_spec.rb
+++ b/spec/features/admin/user_admin_page_spec.rb
@@ -43,16 +43,6 @@
       expect(page).to have_text("Your role is admin and you cannot change it")
     end
 
-    scenario "the list of users should be ordered by email address, ascending" do
-      pending 'fails on github, passess locally, skipping as user admin is going away'
-      login_as(barbara)
-
-      visit admin_users_path
-      expect_within_table_row(1, ["Barbara Gordon", "birdsofprey@education.gov.uk", "Administrator"])
-      expect_within_table_row(2, ["J Jonah Jameson", "jjj@education.gov.uk", "Editor"])
-      expect_within_table_row(3, ["Perry White", "pwhite@education.gov.uk", "Editor"])
-    end
-
     scenario "An admin user should not be able to create a new user without providing a first name" do
       login_as(barbara)
       visit new_admin_user_path(barbara)
diff --git a/spec/features/content_pages_spec.rb b/spec/features/content_pages_spec.rb
index b5a0aab5..4ef3d000 100644
--- a/spec/features/content_pages_spec.rb
+++ b/spec/features/content_pages_spec.rb
@@ -1,6 +1,8 @@
 require "rails_helper"
 
 RSpec.feature "View pages", type: :feature do
+  before { skip 'WIP' if Rails.application.cms? }
+
   given(:parent_page) { FactoryBot.create(:content_page, :published, :top_level) }
   given(:child_page) { FactoryBot.create(:content_page, :published, parent_id: parent_page.id) }
   given(:content_page_version) { FactoryBot.create(:content_page_version) }
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index ec3b63bb..1fdaad35 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -28,15 +28,6 @@
   describe "#ensure_at_least_one_user_has_admin_role" do
     let!(:user) { create :admin }
 
-    it "prevents last admin being removed" do
-      pending 'fails on github, passess locally, skipping as user admin is going away'
-
-      expect(User.admin.count).to eq(1)
-      user.update(role: :editor)
-      expect(user.errors[:role]).to be_present
-      expect(user.reload.role).to eq("admin")
-    end
-
     it "allows a admin to be removed if second present" do
       _second_admin = create :admin
       user.update(role: :editor)
diff --git a/spec/models/web/resource_spec.rb b/spec/models/web/resource_spec.rb
deleted file mode 100644
index 99d1b667..00000000
--- a/spec/models/web/resource_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe Web::Resource, type: :model do
-  before { skip 'WIP' unless Rails.application.cms? }
-
-  describe '.by_name' do
-    specify do
-      expect(described_class.by_name('test.resource')).to be_a described_class
-    end
-  end
-
-  describe '.ordered' do
-    specify do
-      expect(described_class.ordered.map(&:name)).to include('home.hero.body')
-    end
-  end
-end