Merge "Remove a method" into jb-mr2-dev