Merge "A little cleanup." into jb-mr1-dev