raw now uses topics
can remove raw