Clean up in Vector main file