MDL-43537 remove environemnt checks and strings that are not used any more