Cleaned rest of the matrix section

Yay.