use addressing instead of metadata; remove metadata propagation