MODE-1887: Remove commented out lines