Kill tasks improvement