[IMP] Clean based on TDE comments 2