Removed some commented code (#2995)