delete tokens correctly. handle hidden fields