Nuke more useless logic