organize existing, delete cruft