removed all old btb stuff, better names, cleaned up