code refactoring for field collection remove