cleanup + missing ut after merge