MAP-899: clean up imports and also add config utility.