Merge "Removed unused code." into jb-ub-mail-ur10