Bugfix cleaup of matrix files