Merge "Delete dead code." into jb-dev