Merge "Code cleanup." into jb-ub-mail-ur9