Topic cleanup stores

@CHenrie Please review.