refactor some dead conditionals and a case/switch
that wasn't doing anything