BUG#12578441, reintroduced thd->cleanup() in unlink_thd, removed by mistake, added private interface to this function