removing more cruft