Vector class cleanup