I said this too at a different point -- you should clean these up for every function in your diff.