nit just remove all of this stuff, it makes reading the diff harder.