Core/Vehicle: Removed vehicle checks during map checks