fix enum check based on driver team feedback + remove redudant code

fix enum check based on driver team feedback + remove redudant code #1707