Remove enviornment macro