Remove unneeded Empty check.
Remove extra check.
Remove injecting default environment value.