Remove <BT 2.0 workarounds
6 files changed