added remove for datastore, partially added views