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