Clean up uses. Some more methods for matrix.