remove some java code and redo questions