Remove all references to mat3 or mat4
remove watch, we don't use it right now