cleaning up cruft