Updated with cleanup of treeview module.