ls++: another cleanup iteration