Commented-out lines can be removed. I know it feels safer to leave them in so you can look back on how it used to work, but that's what git is for :)