More bt5 cleanup