Remove map.feautureLayer re-use antipattern