deleted even more cruft