Cleaning up code

Also turned off Vehicle Store markers.