Took out dumb 'if false' logic