Remove dsstore
Added index stuff.