Common worker logic removed