Cleanup local directory
Updates for bug 8078