Do we still need these commented out lines?