Java refactor remove delete

Java refactor remove delete