Removed usages of DVec (which will be depricated soon)