squashme: fix leftover cruft