LP 1827051: Remove Java Code, etc.