demo fields cleanup?