Remove leftover cruft