Fix a few NetBeans/FindBugs warnings
Remove unused RoodDirectoryProxy