Removed outdated TODO about matrix_id