Stopped gift from sending unneeded data and gift code cleanup.