Cleanup leftover cruft.