nuke more useless code