(Refactored filed remove)