Clean up some leftover cruft.