[IMP] Minor changes. Commented delete of thread