Update UT, remove dead code