Remove goddam dsstore
Some more changes