Don't remove anything. When I did this I added a new ceiling box for
the light fixture, and ran a cable from the switched outlet to the
ceiling box. At the same time I converted the wall outlet to a regular
always on outlet. Why would you want to remove that?