more cruft I missed earlier