remove standard variables map, replace by list