Removed Photon
merge conflict resolved