Cleaning up matrix and callouts.