clean up and annotate actors