killing more useless code