Clean some cruft