Remove handle logic in actor