Removed more Java code