BT1 code cleanup. start BT2 conversion