Remove unused extra_ field