Remove layers on topic change

As discussed this morning.