Merge "Removal of EnvValidationUtils class and cleanup"