Any need to keep these commented out lines here?