Removed extra actors, simplifying the code.