Remove ExtraShaderDataFormat, just have everything uniform Remove EXTRA_SHADERDATA_FORMAT from shaders too