finish cleaning up swap over to single vehicle entity type