code cleanup: removing unnecessary Collections.unmodifiableMap (System.getEnv() and...