cleanup
Checking tracked fields aren't already present in the Schema, see #667