get rid of reference fields :/