Cleanup: more Matrix4x4 cleanup