cleaned up topics and subtopics for the build