Round two of linalg cleanup