delete and update Comment.java and CommentEntityDef.java