cleanup unneccessary cruft