Merge "Remove obsolete TODOs and obsolete code" into jb-ub-mail-ur8