removed dsstore from everywhere