add check for tasks running and clean them up now