Removed rest of ds_store