cleanup and fix actors