In general I think we should always remove commented lines rather than keep them.