 
 ;; FIXME, remove this route and check if a user exists directly when adding
 (defn get-all-users [_]
-  (let [all-users (mapv (fn [{:keys [user_id email administrator]}]
+  (let [all-users (mapv (fn [{:keys [user_id email]}]
                           {:id    user_id
-                           :email email
-                           :role  (if administrator "admin" "user")})
+                           :email email})
                         (call-sql "get_all_users"))]
     (data-response all-users)))
 
-;; FIXME: We might not want to pass the reset key to the front end.
-;; FIXME: Update get_all_users_by_institution to rename user_id to id and return role instead of administrator.
+;; FIXME: Update get_all_users_by_institution to remove unused values.
 (defn get-institution-users [{:keys [params]}]
   (let [institution-id (tc/str->int (:institutionId params))
-        all-users      (mapv (fn [{:keys [user_id email administrator reset_key institution_role]}]
+        all-users      (mapv (fn [{:keys [user_id email institution_role]}]
                                {:id              user_id
                                 :email           email
-                                :role            (if administrator "admin" "user")
-                                :resetKey        reset_key
                                 :institutionRole institution_role})
                              (call-sql "get_all_users_by_institution_id" institution-id))]
     (data-response all-users)))

                                                  new-email password password-confirmation)]
      (data-response error-msg)
      ;; TODO: Create a single "update_user_information" sql function, use userid instead of email
      (let [updated-email? (when-not (or (str/blank? new-email) (= new-email current-email))
                             (sql-primitive (call-sql "set_user_email" current-email new-email)))]
        (when-not (str/blank? password)
          (call-sql "update_password" (or updated-email? current-email) password))
        (call-sql "set_mailing_list" user-id on-mailing-list?)
        (data-response "" (when updated-email? {:session (assoc session :userName new-email)}))))))

(defn get-password-reset-key [{:keys [params]}]
  (let [reset-key (str (UUID/randomUUID))


(defn login [{:keys [params]}]
  (let [{:keys [email password]} params]
    (if-let [user (first (call-sql-opts "check_login" {:log? false} email password))]
      (data-response ""
                     {:session {:userId   (:user_id user)
                                :userName email
