removed obsolete tags
removed obsolete tags
flattened tree a little