* - Remove duplicate datastore file Which is not referenced and comes from old PR * - Remove unncessary index