Clean up topic hierchy