cleaning up transform, removing matrix tracking