Revert back to dynamic vectors and matrices