Also remove couple unneeded be_t