Remove redundant check
Fix the LISTMODE processing checks
Fix more LISTMODE processing checks