Deleting non-p2p fields, added replacements and added hook_update_N