Bug 23493: Remove commented lines