updates related cleanup work