Continued to remove vector dependence