diff --git a/app.rb b/app.rb
index 8cb12e6..5105150 100644
--- a/app.rb
+++ b/app.rb
@@ -38,8 +38,6 @@ class App < Roda
     r.public
     r.assets
 
-    @users = DB[:users]
-
     session['session_id'] ||= SecureRandom.uuid
 
     # route: GET /
@@ -95,8 +93,7 @@ class App < Roda
 
           @book_info = Cache.get session, @shelf_name.to_sym
           unless @book_info
-            @user ||= @users.first(goodreads_user_id: @goodreads_user_id)
-            access_token = Auth.rebuild_access_token @user
+            access_token = Auth.rebuild_access_token(session['access_token'], session['access_token_secret'])
             @book_info = Goodreads.get_books @shelf_name, @goodreads_user_id, access_token
             Cache.set session, @shelf_name.to_sym => @book_info
           end
diff --git a/lib/auth.rb b/lib/auth.rb
index eede6bf..b28d95b 100644
--- a/lib/auth.rb
+++ b/lib/auth.rb
@@ -20,7 +20,7 @@ def fetch_request_token
     retry if tries < 4
   end
 
-  def rebuild_access_token user
-    OAuth::AccessToken.new(OAUTH_CONSUMER, user[:access_token], user[:access_token_secret])
+  def rebuild_access_token access_token, access_token_secret
+    OAuth::AccessToken.new(OAUTH_CONSUMER, access_token, access_token_secret)
   end
 end
diff --git a/lib/goodreads.rb b/lib/goodreads.rb
index 1fbb2b8..6fc4c72 100644
--- a/lib/goodreads.rb
+++ b/lib/goodreads.rb
@@ -18,7 +18,6 @@ module Goodreads
   HOST = 'www.goodreads.com'
   BASE_URL = "https://#{HOST}"
   GOODREADS_SECRET = ENV.fetch 'GOODREADS_SECRET'
-  USERS = DB[:users]
   BOOK_DETAILS = %w[isbn book/image_url title authors/author/name published rating].freeze
 
   module_function
@@ -118,12 +117,7 @@ def fetch_user request_token
     user_id = xml.xpath('//user').first.attributes.first[1].value
     name = xml.xpath('//user').first.children[1].children.text
 
-    if USERS.first(goodreads_user_id: user_id)
-      USERS.where(goodreads_user_id: user_id).update(access_token: access_token.token, access_token_secret: access_token.secret)
-    else
-      USERS.insert(first_name: name, goodreads_user_id: user_id, access_token: access_token.token, access_token_secret: access_token.secret)
-    end
-    [user_id, goodreads_token, goodreads_secret]
+    [user_id, access_token, goodreads_token, goodreads_secret]
   end
 
   def get_gender books