Removed references to old Metadata Class (everything but Object)