General clean up and pin point of FPS loss to the new car model