Remove unused field and warning