remove extra cruft