Some Vector cleanup