goodbye crufty topics
clean up headers
add directive(!)
these can be deleted (test)