Improved deleting of dynamic fields. Also delete the dynamic field values.