Add metadata for all
Revert "Add metadata for all"

This reverts commit 12f81df2b9efc7864fd8df14afdf5f72068454b5.
Merge remote-tracking branch 'origin/master'