Remove unnecessary hidden fields