Commented lines should go away, we have git to look at what have been there before! ;)