let topic be removed
minor changes