HH-44124 remove unused Environment methods and add new