utils -> vector, cleanup