Don't duplicate environment settings; Remove MAC GOMA config