diff --git a/conditional/blueprints/cache_management.py b/conditional/blueprints/cache_management.py
index fad5924c..a90cd99f 100644
--- a/conditional/blueprints/cache_management.py
+++ b/conditional/blueprints/cache_management.py
@@ -12,7 +12,6 @@
 from conditional.util.ldap import ldap_get_current_students
 from conditional.util.ldap import ldap_get_intro_members
 from conditional.util.ldap import ldap_get_member
-from conditional.util.ldap import ldap_get_onfloor_members
 from conditional.util.user_dict import user_dict_is_eval_director, user_dict_is_rtp
 
 logger = structlog.get_logger()
@@ -52,7 +51,6 @@ def clear_members_cache():
     ldap_get_active_members.cache_clear()
     ldap_get_current_students.cache_clear()
     ldap_get_intro_members.cache_clear()
-    ldap_get_onfloor_members.cache_clear()
 
 
 def clear_committee_cache():
diff --git a/conditional/blueprints/dashboard.py b/conditional/blueprints/dashboard.py
index 0a440af7..b3e7d884 100644
--- a/conditional/blueprints/dashboard.py
+++ b/conditional/blueprints/dashboard.py
@@ -16,8 +16,7 @@
 from conditional.util.major_project import get_project_list
 from conditional.util.member import gatekeep_values, get_freshman_data, get_voting_members, \
     get_cm, get_hm, is_gatekeep_active, req_cm
-from conditional.util.user_dict import user_dict_is_intromember, \
-    user_dict_is_onfloor
+from conditional.util.user_dict import user_dict_is_intromember
 
 logger = structlog.get_logger()
 
@@ -40,14 +39,11 @@ def display_dashboard(user_dict=None):
 
     can_vote = get_voting_members()
 
-    on_floor = user_dict_is_onfloor(user_dict)
-
     data = {}
     data['username'] = uid
 
     data['active'] = ldap_is_uid_active(uid)
     data['bad_standing'] = ldap_is_uid_bad_standing(uid)
-    data['onfloor'] = on_floor
     data['voting'] = bool(uid in can_vote)
 
     data['voting_count'] = {"Voting Members": len(can_vote),
@@ -74,14 +70,10 @@ def display_dashboard(user_dict=None):
 
     data['spring'] = spring
 
-    # only show housing if member has onfloor status
-    if on_floor:
-        housing = {}
-        housing['points'] = user_dict['account'].housingPoints
-        housing['room'] = user_dict['account'].roomNumber
-        housing['queue_pos'] = get_queue_position(uid)
-    else:
-        housing = None
+    housing = {}
+    housing['points'] = user_dict['account'].housingPoints
+    housing['room'] = user_dict['account'].roomNumber
+    housing['queue_pos'] = get_queue_position(uid)
 
     data['housing'] = housing
 
diff --git a/conditional/blueprints/housing.py b/conditional/blueprints/housing.py
index 5931664b..bb078cb4 100644
--- a/conditional/blueprints/housing.py
+++ b/conditional/blueprints/housing.py
@@ -28,7 +28,7 @@ def display_housing(user_dict=None):
     log.info('Display Housing Board')
 
     housing = {}
-    onfloors = ldap.get_group_member_attributes(groups=['onfloor', 'current_student'],
+    members = ldap.get_group_member_attributes(groups=['current_student'],
                                                 attributes=['cn', 'roomNumber'])
     onfloor_freshmen = FreshmanAccount.query.filter(
         FreshmanAccount.room_number is not None
@@ -36,7 +36,7 @@ def display_housing(user_dict=None):
 
     room_list = set()
 
-    for member in onfloors:
+    for member in members:
         if 'roomNumber' not in member:
             continue
 
diff --git a/conditional/blueprints/member_management.py b/conditional/blueprints/member_management.py
index fe3c1119..f961b2fc 100644
--- a/conditional/blueprints/member_management.py
+++ b/conditional/blueprints/member_management.py
@@ -1,7 +1,6 @@
 import csv
 import io
 from datetime import datetime
-from distutils.util import strtobool  # pylint: disable=no-name-in-module,import-error,deprecated-module
 
 import structlog
 from flask import Blueprint, request, jsonify, make_response
@@ -20,27 +19,22 @@
 from conditional.models.models import MemberHouseMeetingAttendance
 from conditional.models.models import HouseMeeting
 from conditional.models.models import EvalSettings
-from conditional.models.models import OnFloorStatusAssigned
 from conditional.models.models import SpringEval
 from conditional.models.models import CurrentCoops
 
 from conditional.blueprints.cache_management import clear_members_cache
 
-from conditional.util.ldap import ldap_get_active_member_uids, ldap_get_onfloor_member_uids, ldap_is_eval_director
+from conditional.util.ldap import ldap_get_active_member_uids, ldap_is_eval_director
 from conditional.util.ldap import ldap_is_active
-from conditional.util.ldap import ldap_is_onfloor
 from conditional.util.ldap import ldap_set_roomnumber
 from conditional.util.ldap import ldap_set_active
 from conditional.util.ldap import ldap_set_inactive
-from conditional.util.ldap import ldap_set_onfloor
 from conditional.util.ldap import ldap_set_housingpoints
 from conditional.util.ldap import ldap_set_current_student
 from conditional.util.ldap import ldap_set_non_current_student
 from conditional.util.ldap import ldap_get_active_members
 from conditional.util.ldap import ldap_get_member
 from conditional.util.ldap import ldap_get_current_students
-from conditional.util.ldap import _ldap_add_member_to_group as ldap_add_member_to_group
-from conditional.util.ldap import _ldap_remove_member_from_group as ldap_remove_member_from_group
 
 from conditional.util.flask import render_template
 from conditional.models.models import attendance_enum
@@ -63,18 +57,19 @@ def display_member_management(user_dict=None):
         return "must be eval director", 403
 
     active_members = set(ldap_get_active_member_uids())
-    onfloor_members = set(ldap_get_onfloor_member_uids())
 
     member_list = ldap.get_group_member_attributes(groups=["current_student"],
                                     attributes=['uid', 'housingPoints', 'roomNumber', 'displayName'])
 
+    on_floor_member_count = 0
+
     for member in member_list:
         member['name'] = member['displayName']
         member['active'] = member['uid'] in active_members
-        member['onfloor'] = member['uid'] in onfloor_members
 
         if 'roomNumber' in member:
             member['room'] = member['roomNumber']
+            on_floor_member_count += 1
 
 
     freshmen = FreshmanAccount.query
@@ -84,12 +79,12 @@ def display_member_management(user_dict=None):
         freshmen_list.append({
             "id": freshman_user.id,
             "name": freshman_user.name,
-            "onfloor": freshman_user.onfloor_status,
             "room": "" if freshman_user.room_number is None else freshman_user.room_number,
             "eval_date": freshman_user.eval_date
         })
 
-    print(freshmen_list)
+        if freshman_user.room_number is not None:
+            on_floor_member_count += 1
 
     settings = EvalSettings.query.first()
     if settings:
@@ -105,9 +100,9 @@ def display_member_management(user_dict=None):
                            username=user_dict['username'],
                            active=member_list,
                            num_current=len(member_list),
+                           num_onfloor=on_floor_member_count,
                            num_active=len(active_members),
                            num_fresh=len(freshmen_list),
-                           num_onfloor=len(onfloor_members),
                            freshmen=freshmen_list,
                            site_lockdown=lockdown,
                            accept_dues_until=accept_dues_until,
@@ -180,7 +175,6 @@ def member_management_adduser(user_dict=None):
     post_data = request.get_json()
 
     name = post_data['name']
-    onfloor_status = post_data['onfloor']
     room_number = post_data['roomNumber']
     log.info(f'Create Freshman Account for {name}')
 
@@ -188,7 +182,7 @@ def member_management_adduser(user_dict=None):
     if room_number == "":
         room_number = None
 
-    db.session.add(FreshmanAccount(name, onfloor_status, room_number))
+    db.session.add(FreshmanAccount(name, room_number))
     db.session.flush()
     db.session.commit()
     return jsonify({"success": True}), 200
@@ -213,7 +207,6 @@ def member_management_uploaduser(user_dict=None):
 
         for new_user in csv_input:
             name = new_user[0]
-            onfloor_status = strtobool(new_user[1])
 
             if new_user[2]:
                 room_number = new_user[2]
@@ -226,7 +219,7 @@ def member_management_uploaduser(user_dict=None):
                 rit_username = None
 
             log.info(f'Create Freshman Account for {name} via CSV Upload')
-            db.session.add(FreshmanAccount(name, onfloor_status, room_number, None, rit_username))
+            db.session.add(FreshmanAccount(name, room_number, None, rit_username))
 
         db.session.flush()
         db.session.commit()
@@ -261,24 +254,10 @@ def edit_uid(uid, flask_request, username):
     current_account = ldap_get_member(username)
     if ldap_is_eval_director(current_account):
         room_number = post_data['roomNumber']
-        onfloor_status = post_data['onfloorStatus']
         housing_points = post_data['housingPoints']
-        log.info(f'Edit {uid} - Room: {post_data['roomNumber']} On-Floor: {post_data['onfloorStatus']} Points: {post_data['housingPoints']}') #pylint: disable=line-too-long
+        log.info(f'Edit {uid} - Room: {post_data['roomNumber']} Points: {post_data['housingPoints']}') #pylint: disable=line-too-long
 
         ldap_set_roomnumber(account, room_number)
-        if onfloor_status:
-            # If a OnFloorStatusAssigned object exists, don't make another
-            if not ldap_is_onfloor(account):
-                db.session.add(OnFloorStatusAssigned(uid, datetime.now()))
-                ldap_add_member_to_group(account, "onfloor")
-        else:
-            for ofs in OnFloorStatusAssigned.query.filter(OnFloorStatusAssigned.uid == uid):
-                db.session.delete(ofs)
-            db.session.flush()
-            db.session.commit()
-
-            if ldap_is_onfloor(account):
-                ldap_remove_member_from_group(account, "onfloor")
         ldap_set_housingpoints(account, housing_points)
 
     # Only update if there's a diff
@@ -305,7 +284,7 @@ def edit_fid(uid, flask_request):
     log = logger.new(request=flask_request, auth_dict={'username': uid})
     post_data = flask_request.get_json()
 
-    log.info(f'Edit freshman-{uid} - Room: {post_data['roomNumber']} On-Floor: {post_data['onfloorStatus']} Eval: {post_data['evalDate']} SigMiss: {post_data['sigMissed']}') #pylint: disable=line-too-long
+    log.info(f'Edit freshman-{uid} - Room: {post_data['roomNumber']} Eval: {post_data['evalDate']} SigMiss: {post_data['sigMissed']}') #pylint: disable=line-too-long
 
     name = post_data['name']
 
@@ -314,7 +293,6 @@ def edit_fid(uid, flask_request):
     else:
         room_number = post_data['roomNumber']
 
-    onfloor_status = post_data['onfloorStatus']
     eval_date = post_data['evalDate']
 
     if post_data['sigMissed'] == "":
@@ -325,7 +303,6 @@ def edit_fid(uid, flask_request):
     FreshmanAccount.query.filter(FreshmanAccount.id == uid).update({
         'name': name,
         'eval_date': datetime.strptime(eval_date, "%Y-%m-%d"),
-        'onfloor_status': onfloor_status,
         'room_number': room_number,
         'signatures_missed': sig_missed
     })
@@ -375,7 +352,6 @@ def get_hm_date(hm_id):
                 'name': acct.name,
                 'eval_date': acct.eval_date.strftime("%Y-%m-%d"),
                 'missed_hm': hms_missed,
-                'onfloor_status': acct.onfloor_status,
                 'room_number': acct.room_number,
                 'sig_missed': acct.signatures_missed
             }), 200
@@ -401,7 +377,6 @@ def get_hm_date(hm_id):
             {
                 'name': account.displayName,
                 'room_number': account.roomNumber,
-                'onfloor_status': ldap_is_onfloor(account),
                 'housing_points': account.housingPoints,
                 'active_member': ldap_is_active(account),
                 'missed_hm': hms_missed,
@@ -498,9 +473,6 @@ def member_management_upgrade_user(user_dict=None):
             log.info(f'Duplicate house meeting attendance! fid: {fid}, uid: {uid}, id: {fhm.meeting_id}')
 
     new_account = ldap_get_member(uid)
-    if acct.onfloor_status:
-        db.session.add(OnFloorStatusAssigned(uid, datetime.now()))
-        ldap_set_onfloor(new_account)
 
     if acct.room_number:
         ldap_set_roomnumber(new_account, acct.room_number)
diff --git a/conditional/models/models.py b/conditional/models/models.py
index 604ea423..a7b7581f 100644
--- a/conditional/models/models.py
+++ b/conditional/models/models.py
@@ -13,16 +13,14 @@ class FreshmanAccount(db.Model):
     id = Column(Integer, primary_key=True)
     name = Column(String(64), nullable=False)
     eval_date = Column(Date, nullable=False)
-    onfloor_status = Column(Boolean)
     room_number = Column(String)
     signatures_missed = Column(Integer)
     rit_username = Column(String(10), nullable=True)
 
-    def __init__(self, name, onfloor, room=None, missed=None, rit_username=None): # pylint: disable=too-many-positional-arguments
+    def __init__(self, name, room=None, missed=None, rit_username=None): # pylint: disable=too-many-positional-arguments
         self.name = name
         today = date.fromtimestamp(time.time())
         self.eval_date = today + timedelta(weeks=6)
-        self.onfloor_status = onfloor
         self.room_number = room
         self.signatures_missed = missed
         self.rit_username = rit_username
@@ -242,14 +240,14 @@ def __init__(self, uid, semester):
         self.semester = semester
 
 
-class OnFloorStatusAssigned(db.Model):
-    __tablename__ = 'onfloor_datetime'
+class HousingQueueAssignment(db.Model):
+    __tablename__ = 'housing_queue_assignment'
     uid = Column(String(32), primary_key=True)
-    onfloor_granted = Column(DateTime, primary_key=True)
+    housing_queue_joined = Column(DateTime, primary_key=True)
 
     def __init__(self, uid, time_granted):
         self.uid = uid
-        self.onfloor_granted = time_granted
+        self.housing_queue_joined = time_granted
 
 
 class Conditional(db.Model):
diff --git a/conditional/templates/dashboard.html b/conditional/templates/dashboard.html
index 2b5c160b..db7444a5 100644
--- a/conditional/templates/dashboard.html
+++ b/conditional/templates/dashboard.html
@@ -20,12 +20,6 @@ <h5 class="email">{{username}}@csh.rit.edu</h5>
                         <span class="badge text-bg-danger">Inactive</span> 
                         {% endif %} 
                         
-                        {% if onfloor %}
-                        <span class="badge text-bg-primary">On-floor Status</span> 
-                        {% else %}
-                        <span class="badge text-bg-warning">Off-floor Status</span> 
-                        {% endif %} 
-                        
                         {% if voting %}
                         <span class="badge text-bg-primary">Voting</span> 
                         {% else %}
diff --git a/conditional/templates/financial.html b/conditional/templates/financial.html
index e9ec5ab5..4d80595a 100644
--- a/conditional/templates/financial.html
+++ b/conditional/templates/financial.html
@@ -10,14 +10,13 @@ <h3 class="panel-title">Financial</h3>
         </div>
         <div class="panel-body table-fill">
             table of every member
-            Name, username, onfloor status, checkbox, submit button
+            Name, username, checkbox, submit button
             checkbox for active (if dues are paid)
             </br>
             <table>
                 <th>
                     <td>name</td>
                     <td>uid</td>
-                    <td>onfloor</td>
                     <td>DUES CHECKBOX</td>
                     <td>SUBMIT BUTTON</td>
                 </th>
@@ -27,7 +26,6 @@ <h3 class="panel-title">Financial</h3>
                 <tr>
                     <td>{{m['name']}}</td>
                     <td><input type="text" name="uid" value="{{m['uid']}}" readonly/></td>
-                    <td>{{m['onfloor']}}</td>
                     <td><input type="checkbox" name="active" {{m['paid']}}></td>
                     <td><input type="submit" value="Update"></td>
                 </tr>
diff --git a/conditional/templates/member_management.html b/conditional/templates/member_management.html
index 4c94f56f..3dfdbe4c 100644
--- a/conditional/templates/member_management.html
+++ b/conditional/templates/member_management.html
@@ -17,7 +17,7 @@ <h3 class="page-title">Administration</h3>
                         <div class="stat-number">{{num_active}}</div>
                         <div class="stat-title">Active Members</div>
                     </div>
-                     <div class="col-xs-6 col-sm-2">
+                    <div class="col-xs-6 col-sm-2">
                         <div class="stat-number">{{num_onfloor}}</div>
                         <div class="stat-title">On-Floor Members</div>
                     </div>
@@ -76,13 +76,6 @@ <h3 class="card-title">Add Users</h3>
                                 <input class="form-control" id="addUserRoom" name="room" type="text">
                             </div>
 
-                            <div class="form-check mb-2">
-                                <input class="form-check-input" type="checkbox" value="" name="onFloor" id="onFloor">
-                                <label class="form-check-label" for="onFloor">
-                                    On-Floor
-                                </label>
-                            </div>
-
                             <input class="btn btn-primary w-100" type="submit" value="Create New User">
                         </form>
                     </div>
@@ -109,7 +102,6 @@ <h3 class="card-title">Freshman Management</h3>
                     <thead>
                         <tr>
                             <th>Name</th>
-                            <th>On Floor</th>
                             <th>Room</th>
                             <th>Evaluation Date</th>
                         </tr>
@@ -122,9 +114,6 @@ <h3 class="card-title">Freshman Management</h3>
                                     {{f['name']}}
                                 </a>
                             </td>
-                            <td>
-                                {% if f['onfloor'] %} &#10003; {% endif %}
-                            </td>
                             <td>{{f['room']}}</td>
                             <td>{{f['eval_date']}}</td>
                         </tr>
@@ -155,7 +144,6 @@ <h3 class="card-title my-0">
                         <tr>
                             <th>Name</th>
                             <th>Active</th>
-                            <th>On Floor</th>
                             <th>Room</th>
                             <th>Points</th>
                         </tr>
@@ -172,9 +160,6 @@ <h3 class="card-title my-0">
                             <td>
                                 {% if m['active'] %} &#x2605; {% endif %}
                             </td>
-                            <td>
-                                {% if m['onfloor'] %} &#10003; {% endif %}
-                            </td>
                             <td>{% if m['room'] %}{{m['room']}}{% endif %}</td>
                             <td>{{m['housingPoints']}}</td>
                         </tr>
@@ -212,13 +197,6 @@ <h4 class="modal-title mb-0" id="editUserTitle">Edit User</h4>
                 </div>
 
                 <div class="mb-3 p-1 d-flex">
-                    <div class="form-check flex-grow-1">
-                        <input class="form-check-input" type="checkbox" value="" name="onFloor" id="onFloor">
-                        <label class="form-check-label" for="onFloor">
-                            On-Floor
-                        </label>
-                    </div>
-
                     <div class="form-check flex-grow-1">
                         <input class="form-check-input" type="checkbox" value="" name="dues" id="dues">
                         <label class="form-check-label" for="dues">
@@ -286,13 +264,6 @@ <h4 class="modal-title" id="editFreshmanTitle">Edit Freshman Account</h4>
                     <input class="form-control" id="sigMissed" name="sigMissed" type="number">
                 </div>
 
-                <div class="form-check mb-3">
-                    <input class="form-check-input" type="checkbox" value="" name="onFloor" id="onFloor">
-                    <label class="form-check-label" for="onFloor">
-                        On-Floor
-                    </label>
-                </div>
-
                 <p class="lead">Missed House Meetings</p>
 
                 <div class="alert alert-info no-missed-hm-alert" role="alert">
diff --git a/conditional/util/housing.py b/conditional/util/housing.py
index 706d436f..47884dd7 100644
--- a/conditional/util/housing.py
+++ b/conditional/util/housing.py
@@ -2,8 +2,7 @@
 
 from conditional import ldap
 
-from conditional.models.models import InHousingQueue
-from conditional.models.models import OnFloorStatusAssigned
+from conditional.models.models import HousingQueueAssignment, InHousingQueue
 
 def get_housing_queue(is_eval_director=False):
 
@@ -13,13 +12,13 @@ def get_housing_queue(is_eval_director=False):
     # both the member's UID and their on-floor datetime.
     in_queue = {
         entry.uid: {
-            'time': entry.onfloor_granted
+            'time': entry.housing_queue_joined
         } for entry in InHousingQueue.query.outerjoin(
-            OnFloorStatusAssigned,
-            OnFloorStatusAssigned.uid == InHousingQueue.uid
+            HousingQueueAssignment,
+            HousingQueueAssignment.uid == InHousingQueue.uid
         ).with_entities(
             InHousingQueue.uid,
-            OnFloorStatusAssigned.onfloor_granted
+            HousingQueueAssignment.housing_queue_joined
         ).all()
     }
 
diff --git a/conditional/util/ldap.py b/conditional/util/ldap.py
index a34ad086..6329e874 100644
--- a/conditional/util/ldap.py
+++ b/conditional/util/ldap.py
@@ -48,14 +48,6 @@ def ldap_get_intro_members() -> list[CSHMember]:
 def ldap_get_intro_member_uids() -> list[str]:
     return _ldap_get_group_member_uids("intromembers")
 
-@service_cache(maxsize=1024)
-def ldap_get_onfloor_members() -> list[CSHMember]:
-    return _ldap_get_group_members("onfloor")
-
-@service_cache(maxsize=1024)
-def ldap_get_onfloor_member_uids() -> list[str]:
-    return _ldap_get_group_member_uids("onfloor")
-
 @service_cache(maxsize=1024)
 def ldap_get_current_students() -> list[CSHMember]:
     return _ldap_get_group_members("current_student")
@@ -106,11 +98,6 @@ def ldap_is_intromember(account) -> bool:
     return _ldap_is_member_of_group(account, 'intromembers')
 
 
-@service_cache(maxsize=128)
-def ldap_is_onfloor(account) -> bool:
-    return _ldap_is_member_of_group(account, 'onfloor')
-
-
 @service_cache(maxsize=128)
 def ldap_is_financial_director(account) -> bool:
     return _ldap_is_member_of_directorship(account, 'financial')
@@ -184,9 +171,3 @@ def ldap_set_failed(account):
 def ldap_set_bad_standing(account):
     _ldap_add_member_to_group(account, 'bad_standing')
     ldap_get_member.cache_clear()
-
-
-def ldap_set_onfloor(account):
-    _ldap_add_member_to_group(account, 'onfloor')
-    ldap_get_onfloor_members.cache_clear()
-    ldap_get_member.cache_clear()
diff --git a/conditional/util/member.py b/conditional/util/member.py
index 3904a16c..7d85d5bb 100644
--- a/conditional/util/member.py
+++ b/conditional/util/member.py
@@ -1,7 +1,7 @@
 from datetime import datetime
 from sqlalchemy import func, or_
 
-from conditional import start_of_year, ldap
+from conditional import start_of_year
 from conditional.models.models import CommitteeMeeting, FreshmanAccount
 from conditional.models.models import CurrentCoops
 from conditional.models.models import FreshmanEvalData
@@ -64,9 +64,6 @@ def get_freshman_data(user_name):
     freshman['eval_date'] = freshman_data.eval_date
     return freshman
 
-def get_onfloor_members() -> set[str]:
-    return set(ldap.get_group_member_uids(groups=['onfloor', 'active']))
-
 def get_cm(member):
     query_result = CommitteeMeeting.query.join(
         MemberCommitteeAttendance,
diff --git a/frontend/javascript/modules/addUser.js b/frontend/javascript/modules/addUser.js
index e9ecb5a4..105c09d4 100644
--- a/frontend/javascript/modules/addUser.js
+++ b/frontend/javascript/modules/addUser.js
@@ -19,7 +19,6 @@ export default class AddUser {
 
     const payload = {
       name: this.form.querySelector('input[name=name]').value,
-      onfloor: this.form.querySelector('input[name=onFloor]').checked,
       roomNumber: this.form.querySelector('input[name=room]').value,
     };
 
diff --git a/frontend/javascript/modules/editUser.js b/frontend/javascript/modules/editUser.js
index dee253d2..d17d4917 100644
--- a/frontend/javascript/modules/editUser.js
+++ b/frontend/javascript/modules/editUser.js
@@ -64,10 +64,6 @@ export default class EditUser {
     // Room Number
     modal.querySelector('input[name=room]').value = this.data.room_number;
 
-    // On-floor Status
-    modal.querySelector('input[name=onFloor]').checked =
-      this.data.onfloor_status;
-
     // Dues
     modal.querySelector('input[name=dues]').checked = this.data.active_member;
 
@@ -190,10 +186,6 @@ export default class EditUser {
     // Room Number
     modal.querySelector('input[name=room]').value = this.data.room_number;
 
-    // On-floor Status
-    modal.querySelector('input[name=onFloor]').checked =
-      this.data.onfloor_status;
-
     // Evaluation Date
     modal.querySelector('input[name=evalDate]').value = this.data.eval_date;
     new DatePicker(modal.querySelector('input[name=evalDate]'));
@@ -349,7 +341,6 @@ export default class EditUser {
       // Save user details
       const payload = {
         roomNumber: null,
-        onfloorStatus: modal.querySelector('input[name=onFloor]').checked,
       };
 
       if (this.type === 'member') {
diff --git a/migrations/versions/a9a078f6b3b8_remove_on_floor_status.py b/migrations/versions/a9a078f6b3b8_remove_on_floor_status.py
new file mode 100644
index 00000000..49cb6b1e
--- /dev/null
+++ b/migrations/versions/a9a078f6b3b8_remove_on_floor_status.py
@@ -0,0 +1,38 @@
+"""remove on floor status
+
+Revision ID: a9a078f6b3b8
+Revises: 3f094d78df95
+Create Date: 2026-10-26 20:18:38.312393
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'a9a078f6b3b8'
+down_revision = '3f094d78df95'
+
+from alembic import op
+import sqlalchemy as sa
+
+def upgrade():
+
+    op.rename_table('onfloor_datetime', 'housing_queue_assignment')
+
+    with op.batch_alter_table('housing_queue_assignment', schema=None) as batch_op:
+        batch_op.alter_column('onfloor_granted', new_column_name='housing_queue_joined')
+
+    with op.batch_alter_table('freshman_accounts', schema=None) as batch_op:
+        batch_op.drop_column('onfloor_status')
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    op.rename_table('housing_queue_assignment', 'onfloor_datetime')
+
+    with op.batch_alter_table('onfloor_datetime', schema=None) as batch_op:
+        batch_op.alter_column('housing_queue_joined', new_column_name='onfloor_granted')
+
+    with op.batch_alter_table('freshman_accounts', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('onfloor_status', sa.BOOLEAN(), autoincrement=False, nullable=True))
+
+    # ### end Alembic commands ###