Merge "Delete unused fields in class"