We had decided to leave the headers that had been previously been needed in commented out state so we could easily see the changes we had made. So, like the ones above it, i left it that way. You want me to remove them all? I'm happy either way.