[Worker] Get rid of some useless and duplicated code