Removed unnecessary quaternion to matrix  conversions