and another cleanup round