Source cleanup and adding new vehicle selection list