remove unneeded toolbars
handle namespaced nodes (somewhat)