Remove case/when statement