Oh, I thought you did it already.
I'd get a kit to cut down on elbow grease, especially since this isn't the last one you'll be doing, and because it's like $9
Amazon
Removing the headlight makes it easier to polish and eliminates the need to tape off or possibility of damaging the surrounding area.