Is Matrix4.h still needed?