Merge "DO NOT MERGE Remove dead code" into jb-dev