relation fields cleanup