Again, don't comment things out.  git will maintain the history of them being there.  Comments should not.