Vectors cleanup (part 2).