src/topics.js cleanup