Track Java stuff locally and removed mgerrit