Update a comment in AbstractStore, remove more code.