app fields cleanup