BLAS removal, type cleanups