Removing leftover cruft