cleaning up cruft.