Topic routing cleanup

@CHenrie Please review.