cleanup and add new matrix vectors