Cleanup topic stuff a bit