cleaned up actor stuff