Use new vocab terms in datastream model
Remove broken properties