Remove other cruft