Remove unnecessary fields