deleted more cruft