remove unused specs
add Datastore Controller