diff --git a/db/migrate/20211228135426_add_indexes_to_notifications.rb b/db/migrate/20211228135426_add_indexes_to_notifications.rb
new file mode 100644
index 00000000..15288920
--- /dev/null
+++ b/db/migrate/20211228135426_add_indexes_to_notifications.rb
@@ -0,0 +1,6 @@
+class AddIndexesToNotifications < ActiveRecord::Migration[5.2]
+  def change
+    add_index :notifications, :recipient_id
+    add_index :notifications, :new
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index eb8141ef..017794d2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_12_19_153054) do
+ActiveRecord::Schema.define(version: 2021_12_28_135426) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -114,6 +114,8 @@ ActiveRecord::Schema.define(version: 2021_12_19_153054) do
     t.boolean "new"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["new"], name: "index_notifications_on_new"
+    t.index ["recipient_id"], name: "index_notifications_on_recipient_id"
   end
 
   create_table "profiles", force: :cascade do |t|
@@ -257,12 +259,7 @@ ActiveRecord::Schema.define(version: 2021_12_19_153054) do
     t.integer "asked_count", default: 0, null: false
     t.integer "answered_count", default: 0, null: false
     t.integer "commented_count", default: 0, null: false
-    t.string "display_name"
     t.integer "smiled_count", default: 0, null: false
-    t.string "motivation_header", default: "", null: false
-    t.string "website", default: "", null: false
-    t.string "location", default: "", null: false
-    t.text "bio", default: "", null: false
     t.string "profile_picture_file_name"
     t.boolean "profile_picture_processing"
     t.integer "profile_picture_x"
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 3e27b935..384941a4 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -100,8 +100,9 @@ EOS
   describe "#answer_opengraph" do
     context "sample user and answer" do
       let!(:user) { FactoryBot.create(:user,
-                                     display_name: '',
-                                     bio: 'A bunch of raccoons in a trenchcoat.',
+                                      profile: {
+                                        display_name: '',
+                                        description: 'A bunch of raccoons in a trenchcoat.'},
                                      screen_name: 'raccoons') }
       let(:answer) { FactoryBot.create(:answer,
                                        user_id: user.id,) }
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index c928fc5b..df17aa45 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -12,6 +12,7 @@ RSpec.describe User, type: :model do
         password: 'y_u_no_secure_password?',
         email: 'nice.meme@nsa.gov'
       )
+      Profile.new(user: @user)
     end
 
     subject { @user }
@@ -23,7 +24,7 @@ RSpec.describe User, type: :model do
     end
 
     it '#motivation_header has a default value' do
-      expect(@user.motivation_header).to match ''
+      expect(@user.profile.motivation_header).to match ''
     end
 
     it 'does not save an invalid screen name' do