preparing for removal of params - #4006 (remove general map parameters from distribut...