Eliminate DatastoreContext CSS dependency