merge conflicts
updated feature - update hook to delete deprecated fields