#JC-536: Remove extra task executor