little more cleanup of in-memory event store