remove them again (?)

yup, you can replace them without removing the headlight assemblies --