[SP] More renderer cleanup. Remove unused files (null, .def, .zip)
[SP] Fix bad merge referencing moved file