Got rid of leftover cruft