more cruft to remove