More upper removal

More upper removal