add duplicate photon remove

Photon is pushy enough that we have to remove it everywhere. Still add it back in after we are done.