More cleanup on the sample metadata.