cherry-picked missing fixing
remove tDiary base classes