Cleaning up code and removing Thermal Scopes

Also turning off Vehicle Store items since there are currently no
Vehicle Stores.