removed legacy-flag_checking