Get rid of some unnecessary logic