hacking away at the cruft