added metadata wrapper hack
dropped extraneous uses