Comment out everything? Odd way for an upgrade...

You can just put them in. Working on Shader() in WOrld