remove even more cruft