Update to BT3; Remove custom helpers; Remove searches