More cleanup of fileTree.