Finish update gift status refactor by removing old code