Removed rest of old java code