Remove unused Environment use.
Remove unused CommandLocator use.