Merge "Remove obsolete variables." into jb-mr1-dev