Removed Vehicle class