cleanup no longer relevant comments