Merge "Initial clean up of the chips code" into jb-ub-mail-ur9