trim unnecessary demo fields