* Remove locking around the org.apache.fs.FileUtil command (uses locking at lower level shim commands)
* Cleanup around some unnecessary variables.