more UB removal