Refactored remove_field logic; combined with add_field; added test case
Remove dead code