Eugene Simakin Task specific code removed