more cleanup
funcgraph