cleanup topics & organisations code