[2.1] Remove metadata/id from the representation

Pending discussion on its format