Cast pointer appropriate to fix build error due to const-ness
Remove left over from Variable Conc
Remove removed vars from constructor
Fix compile issues introduced during rebasing
Fix compile issues introduced during rebasing in UniformInit
Remove nonexistant files