refactoring to remove all actors. too complex and untestable and confusing for too little benefit