Remove all scalar:metadata references