Remove some leftover cruft