mostly fixing field collection deletion during migration