Remove old BT workaround