another cleanup pass