#104 cleanup store lifecycle