refactor room abort