Remove extraneoous cruft