Removing default initialization of matrices