File rename, cruft removal.