Simplify topic change procedure