Making comments go away AND adding staging-legacy section under cloud