remove hard-coded map short-circuit