properly remove fields too.