Refactoring
Fixed field deletion