Get rid of some unused excess logic.