Refactored removing cars.