Better handling for XML and metadata, removed "delete" warning for now