Removed MetadataDatastreamHelper
Removed remainder of deprecated specs