cleaning code. fixing datamap configs