leftover cruft removed