include cleanup around symbolizer helpers