If something is going into master commented out, it should probably be deleted, unless it's something you know will be put back into master in the next release (or very soon).