diff --git a/src/main/resources/sandag_abm.properties b/src/main/resources/sandag_abm.properties
index 890366520..5d31c0d96 100644
--- a/src/main/resources/sandag_abm.properties
+++ b/src/main/resources/sandag_abm.properties
@@ -85,30 +85,6 @@ TNC.totalThreads = 10
 #Process.Debug.HHs.Only = false
 Debug.Trace.HouseholdIdList = 
 #
-## Internal-External models
-#internalExternal.seek = false
-#internalExternal.trace = 50
-#
-## Cross-Border models
-#crossBorder.seek = false
-## trace by tourId
-#crossBorder.trace = 12
-#
-## Visitor models
-#visitor.seek = false
-##trace by tourId
-##visitor.trace = 742
-#visitor.trace = 742
-#
-## Special event models
-#specialEvent.seek = false
-#specialEvent.trace = 5855
-#
-## Trace TransCAD trip table creation by TAZ (to/from); only applies to SD resident model
-#tripTable.trace = 4384
-#
-#RunModel.LogResults = true
-#
 ##############################################################################################################################################################################
 ## PATH PROPERTIES:  MODIFY AS NEEDED WHEN COPY RELEASE TO A LOCAL RUN FOLDER
 ##############################################################################################################################################################################
@@ -213,46 +189,6 @@ Mobility.AV.CostPerMileFactor = 0.7
 #crossBorder.avShare = 0.0
 #
 ##-------------------------------------------------------------------------------------------
-##  Taxi and TNC cost and wait time parameters
-##-------------------------------------------------------------------------------------------
-## 	3 modes: taxi, TNC - single, and TNC - shared
-## 	baseFare: Initial fare
-## 	costPerMile: The cost per mile
-## 	costPerMinute: The cost per minute
-## 	costMinimum: The minimum cost (for TNC modes only)
-##
-## 	Wait times are drawn from a distribution by area type (emp+hh)/sq. miles
-## 	The mean and standard deviation is given for each area type range
-## 	The ranges are configurable, set by WaitTimeDistribution.EndPopEmpPerSqMi
-#
-#taxi.baseFare = 1.78
-#taxi.costPerMile = 1.87
-#taxi.costPerMinute = 0.08
-#
-#TNC.single.baseFare = 1.78
-#TNC.single.costPerMile = 1.08
-#TNC.single.costPerMinute = 0.19
-#TNC.single.costMinimum = 5.84
-#
-## use lower costs - these are synthesized, need real prices
-#TNC.shared.baseFare = 1.78
-#TNC.shared.costPerMile = 0.36
-#TNC.shared.costPerMinute = 0.06
-#TNC.shared.costMinimum = 2.43
-#
-##Note: the following comma-separated value properties cannot have spaces between them, or else the RuntimeConfiguration.py code won't work
-#TNC.single.waitTime.mean = 10.3,8.5,8.4,6.3,4.7
-#TNC.single.waitTime.sd = 4.1,4.1,4.1,4.1,4.1
-#
-#TNC.shared.waitTime.mean = 15.0,15.0,11.0,8.0,7.0
-#TNC.shared.waitTime.sd = 4.1,4.1,4.1,4.1,4.1
-#
-#Taxi.waitTime.mean = 26.5,17.3,13.3,9.5,5.5
-#Taxi.waitTime.sd = 6.4,6.4,6.4,6.4,6.4
-#
-#WaitTimeDistribution.EndPopEmpPerSqMi = 500,2000,5000,15000,9999999999
-#
-##-------------------------------------------------------------------------------------------
 ##  Taxi and TNC vehcicle trip conversion factors
 ##-------------------------------------------------------------------------------------------
 ##  The following properties are used to split out the taxi, TNC-single, and TNC-shared trips into vehicle trips to be added to the rest of the vehicle trips by occupancy prior to assignment.
@@ -313,79 +249,6 @@ transit.bus.pceveh = 3.0
 ##############################################################################################################################################################################
 Model.Random.Seed = 1
 #
-#RunModel.Clear.MatrixMgr.At.Start = false
-#
-## Set to true if read the accessibilities from an input file instead of calculating them prior to running CTRAMP
-#acc.read.input.file = false
-#
-## Setting shadow price files to null will reset prices to 0.  If running new land-use scenario, set files to null and set maximum iterations to 20.
-## Then copy shadow price output files to input directory, set maximum iterations to 1 for any subsequent runs with the same land-use file.
-#UsualWorkLocationChoice.ShadowPrice.Input.File = input/ShadowPricingOutput_work_9.csv
-#UsualSchoolLocationChoice.ShadowPrice.Input.File = input/ShadowPricingOutput_school_9.csv
-#uwsl.ShadowPricing.Work.MaximumIterations = 1
-#uwsl.ShadowPricing.School.MaximumIterations = 1
-#uwsl.ShadowPricing.OutputFile = output/ShadowPricingOutput.csv
-#
-#uwsl.run.workLocChoice = true
-#uwsl.run.schoolLocChoice = true
-#uwsl.write.results = true
-#
-#uwsl.use.new.soa = false
-#nmdc.use.new.soa = false
-#slc.use.new.soa = false
-#
-## properties for distributed time coefficient
-#distributedTimeCoefficients = true
-#
-#timeDistribution.mean.work = 1.0
-#timeDistribution.standardDeviation.work = 0.7
-#timeDistribution.mean.nonWork = 1.0
-#timeDistribution.standardDeviation.nonWork = 0.6
-#
-#timeDistribution.randomSeed = 2301832
-#
-## value of time thresholds for skimming, assignment, mode choice UECs and trip tables ($/hr).
-#valueOfTime.threshold.low = 8.81
-#valueOfTime.threshold.med = 18.0
-#
-#
-## save tour mode choice utilities and probabilities (for debugging purpose)
-#TourModeChoice.Save.UtilsAndProbs = true
-#
-## packet size for distributing households, DO NOT change
-#distributed.task.packet.size = 200
-#
-##RunModel.RestartWithHhServer = uwsl
-#RunModel.RestartWithHhServer = none
-##RunModel.RestartWithHhServer = ao
-##RunModel.RestartWithHhServer = stf
-#
-## Model Component run flags; Wu's note: not functional yet
-#RunModel.PreAutoOwnership = true
-#RunModel.UsualWorkAndSchoolLocationChoice = true
-#RunModel.AutoOwnership = true
-#RunModel.TransponderChoice = true
-#RunModel.FreeParking = true
-#RunModel.CoordinatedDailyActivityPattern = true
-#RunModel.IndividualMandatoryTourFrequency = true
-#RunModel.MandatoryTourModeChoice = true
-#RunModel.MandatoryTourDepartureTimeAndDuration = true
-#RunModel.SchoolEscortModel = true
-#RunModel.JointTourFrequency = true
-#RunModel.JointTourLocationChoice = true
-#RunModel.JointTourDepartureTimeAndDuration = true
-#RunModel.JointTourModeChoice = true
-#RunModel.IndividualNonMandatoryTourFrequency = true
-#RunModel.IndividualNonMandatoryTourLocationChoice = true
-#RunModel.IndividualNonMandatoryTourDepartureTimeAndDuration = true
-#RunModel.IndividualNonMandatoryTourModeChoice = true
-#RunModel.AtWorkSubTourFrequency = true
-#RunModel.AtWorkSubTourLocationChoice = true
-#RunModel.AtWorkSubTourDepartureTimeAndDuration = true
-#RunModel.AtWorkSubTourModeChoice = true
-#RunModel.StopFrequency = true
-#RunModel.StopLocation = true
-#
 ##############################################################################################################################################################################
 ##
 ## INPUT PROPERTIES
@@ -421,346 +284,17 @@ PopulationSynthesizer.IndustryCodes = input/activity_code_indcen_acs.csv
 #Results.WriteDataToFiles = true
 Results.HouseholdDataFile = output/resident/final_households.csv
 Results.PersonDataFile = output/resident/final_persons.csv
-#Results.IndivTourDataFile = output/indivTourData.csv
-#Results.JointTourDataFile = output/jointTourData.csv
 Results.TripDataFile = output/resident/final_trips.csv
-#Results.JointTripDataFile = output/jointTripData.csv
-#Results.WriteDataToDatabase = false
-#Results.HouseholdTable = household_data
-#Results.PersonTable = person_data
-#Results.IndivTourTable = indiv_tour_data
-#Results.JointTourTable = joint_tour_data
-#Results.IndivTripTable = indiv_trip_data
-#Results.JointTripTable = joint_trip_data
-#Results.AutoTripMatrix = output/autoTrips
-#Results.TranTripMatrix = output/tranTrips
-#Results.NMotTripMatrix = output/nmotTrips
-#Results.OthrTripMatrix = output/othrTrips
-#Results.PNRFile = output/PNRByTAP_Vehicles.csv
-#Results.CBDFile = output/CBDByMGRA_Vehicles.csv
 Results.MatrixType = OMX
 #Results.segmentByTransponderOwnership = true
 #
-#
-#Results.AutoOwnership = output/aoResults.csv
-#read.pre.ao.results = false
-#read.pre.ao.filename = output/aoResults_pre.csv
-#
-#Results.UsualWorkAndSchoolLocationChoice = output/wsLocResults.csv
-#read.uwsl.results = false
-#read.uwsl.filename = output/wsLocResults_1.csv
-#
 #############################################################################################################################################################################
 #
 # CORE MODEL UECS
 #
 #############################################################################################################################################################################
-# UECs for calculating accessibilities
-#acc.uec.file = %project.folder%/uec/Accessibilities.xls
-#acc.data.page = 0
-#acc.sov.offpeak.page = 1
-#acc.sov.peak.page = 2
-#acc.hov.offpeak.page = 3
-#acc.hov.peak.page = 4
-#acc.maas.offpeak.page = 5
-#acc.maas.peak.page = 6
-#acc.nonmotorized.page = 7
-#acc.constants.page = 8
-#acc.sizeTerm.page = 9
-#acc.schoolSizeTerm.page = 10
-#acc.workerSizeTerm.page = 11
-#acc.dcUtility.uec.file = %project.folder%/uec/Accessibilities_DC.xls
-#acc.dcUtility.data.page = 0
-#acc.dcUtility.page = 1
-#
-## accessibility file location
-#acc.output.file = input/accessibilities.csv
-#
-##UECs for calculating destination choice based land use accessibilities
-#lu.acc.dcUtility.uec.file = %project.folder%/uec/Accessibilities_LU_DC.xls
-#lu.acc.dcUtility.data.page = 0
-#lu.acc.dcUtility.page = 1
-#lu.accessibility.alts.file = Acc_LU_alts.csv
-#
-## land use accessibililty file locations
-#lu.acc.output.file = output/luAccessibilities.csv
-#lu.acc.mc.logsums.output.file = output/luLogsums.csv
-#
-## set either or both averaging methods to be used to write LU accessibilities files
-## also requires command line parameter "-luAcc true" and acc.read.input.file = false
-#lu.acc.simple.averaging.method = true
-#lu.acc.logit.averaging.method = true
-#
-#accessibility.alts.file = Acc_alts.csv
-#
-##UEC for Mandatory accessibilities
-#acc.mandatory.uec.file = %project.folder%/uec/MandatoryAccess.xls
-#acc.mandatory.data.page = 0
-#acc.mandatory.auto.page = 1
-#acc.mandatory.autoLogsum.page = 2
-#acc.mandatory.bestWalkTransit.page = 3
-#acc.mandatory.bestDriveTransit.page = 4
-#acc.mandatory.transitLogsum.page = 5
-#
-## UECs for auto ownership model
-#ao.uec.file = AutoOwnership.xls
-#ao.data.page = 0
-#ao.model.page = 1
-#
-## UECs for Mandatory tour destination choice model
-#uwsl.dc.uec.file = TourDestinationChoice2020.xls
-#uwsl.dc2.uec.file = TourDestinationChoice2.xls
-#uwsl.soa.uec.file = DestinationChoiceAlternativeSample.xls
-#uwsl.soa.alts.file = DestinationChoiceAlternatives.csv
-#uwsl.work.soa.SampleSize = 30
-#uwsl.school.soa.SampleSize = 30
-#
-## The UEC file for work purposes includes TAZ Size in the expressions
-#work.soa.uec.file = TourDcSoaDistance.xls
-#work.soa.uec.data = 0
-#work.soa.uec.model = 1
-#
-## The UEC file for school purposes does not include TAZ Size in the expressions
-## so that the utilities can be stored as exponentiated distance utility matrices
-## for univ, hs, gs, and ps, and then multiplied by the various school segment
-## size terms for each of these 4 groups of school segments.
-#univ.soa.uec.file = TourDcSoaDistanceNoSchoolSize.xls
-#univ.soa.uec.data = 0
-#univ.soa.uec.model = 1
-#
-#hs.soa.uec.file = TourDcSoaDistanceNoSchoolSize.xls
-#hs.soa.uec.data = 0
-#hs.soa.uec.model = 2
-#
-#gs.soa.uec.file = TourDcSoaDistanceNoSchoolSize.xls
-#gs.soa.uec.data = 0
-#gs.soa.uec.model = 3
-#
-#ps.soa.uec.file = TourDcSoaDistanceNoSchoolSize.xls
-#ps.soa.uec.data = 0
-#ps.soa.uec.model = 4
-#
-##UECs for transponder ownership model
-#tc.choice.avgtts.file = output/transponderModelAccessibilities.csv
-#tc.uec.file = TransponderOwnership.xls
-#tc.data.page = 0
-#tc.model.page = 1
-#tc.everyone.owns = 0
-#
-#
-##UECs for parking provision model
-#fp.uec.file = ParkingProvision.xls
-#fp.data.page = 0
-#fp.model.page = 1
-#
-##UEC for telecommute model
-#te.uec.file = Telecommute.xls
-#te.data.page = 0
-#te.model.page = 1
-#
-#
-##UECs for CDAP model
-#cdap.uec.file = CoordinatedDailyActivityPattern.xls
-#cdap.data.page = 0
-#cdap.one.person.page = 1
-#cdap.two.person.page = 2
-#cdap.three.person.page = 3
-#cdap.all.person.page = 4
-#cdap.joint.page = 5
-#
-##UECs for individual mandatory tour frequency model
-#imtf.uec.file = MandatoryTourFrequency.xls
-#imtf.data.page = 0
-#imtf.model.page = 1
-#
-##UECs for Non-Mandatory tour destination sampling
-#nonSchool.soa.uec.file = TourDcSoaDistance.xls
-#escort.soa.uec.data = 0
-#escort.soa.uec.model = 2
-#other.nonman.soa.uec.data = 0
-#other.nonman.soa.uec.model = 3
-#atwork.soa.uec.data = 0
-#atwork.soa.uec.model = 4
-#
 soa.taz.dist.alts.file = SoaTazDistAlts.csv
 #
-#nmdc.dist.alts.file = NonMandatoryTlcAlternatives.csv
-#nmdc.soa.alts.file = DestinationChoiceAlternatives.csv
-#nmdc.soa.SampleSize = 30
-#
-##UECs for Non-Mandatory tour destination choice model
-#nmdc.uec.file2 = TourDestinationChoice2.xls
-#nmdc.uec.file = TourDestinationChoice2020.xls
-#nmdc.data.page = 0
-#nmdc.escort.model.page = 7
-#nmdc.shop.model.page = 8
-#nmdc.maint.model.page = 9
-#nmdc.eat.model.page = 10
-#nmdc.visit.model.page = 11
-#nmdc.discr.model.page = 12
-#nmdc.atwork.model.page = 13
-#
-## following properties use tod sampling instead of logsums
-#nmdc.SampleTODPeriod = true
-#nmdc.SampleTODPeriod.file = input/Non_Mand_Tours_ArrDep_Distbn.csv
-#
-##UECs for Non-Mandatory tour destination sampling
-#nmdc.soa.uec.file = DestinationChoiceAlternativeSample.xls
-#nmdc.soa.data.page = 0
-#nmdc.soa.escort.model.page = 6
-#nmdc.soa.shop.model.page = 7
-#nmdc.soa.maint.model.page = 7
-#nmdc.soa.eat.model.page = 7
-#nmdc.soa.visit.model.page = 7
-#nmdc.soa.discr.model.page = 7
-#nmdc.soa.atwork.model.page = 8
-#
-##UECs for School Escorting Model
-#school.escort.uec.filename = SchoolEscorting.xls
-#school.escort.alts.file = SchoolEscortingAlts.csv
-#school.escort.data.sheet = 0
-#school.escort.outbound.model.sheet = 1
-#school.escort.inbound.conditonal.model.sheet = 2
-#school.escort.outbound.conditonal.model.sheet = 3
-#school.escort.RNG.offset = 384571483
-#
-##UECs for tour mode choice model
-#tourModeChoice.uec.file = TourModeChoice.xls
-#tourModeChoice.maint.model.page = 4
-#tourModeChoice.discr.model.page = 5
-#tourModeChoice.atwork.model.page = 6
-#
-## utility coefficients by tour purpose (work, univ, school, maintenance, discretionary, work-based). These are at tour level.
-#tour.utility.ivt.coeffs = -0.016,-0.016,-0.01,-0.017,-0.015,-0.032
-#tour.utility.income.coeffs = -0.625,-0.262,-0.262,-0.262,-0.262,-0.262
-#tour.utility.income.exponents = 0.6,0.5,0.5,0.5,0.5,0.5
-#
-##UECs for tour TOD choice model
-#departTime.uec.file = TourDepartureAndDuration.xls
-#departTime.data.page = 0
-#departTime.work.page = 1
-#departTime.univ.page = 2
-#departTime.school.page = 3
-#departTime.escort.page = 4
-#departTime.shop.page = 5
-#departTime.maint.page = 6
-#departTime.eat.page = 7
-#departTime.visit.page = 8
-#departTime.discr.page = 9
-#departTime.atwork.page = 10
-#departTime.alts.file = DepartureTimeAndDurationAlternatives.csv
-#
-##UECs for joint tour frequency choice model
-#jtfcp.uec.file = JointTourFrequency.xls
-#jtfcp.alternatives.file = JointAlternatives.csv
-#jtfcp.data.page = 0
-#jtfcp.freq.comp.page = 1
-#jtfcp.participate.page = 2
-#
-##UECs for individual non-mandatory tour frequency model
-#inmtf.uec.file = NonMandatoryIndividualTourFrequency.xls
-#inmtf.FrequencyExtension.ProbabilityFile = IndividualNonMandatoryTourFrequencyExtensionProbabilities_p1.csv
-#IndividualNonMandatoryTourFrequency.AlternativesList.InputFile = IndividualNonMandatoryTourFrequencyAlternatives.csv
-#inmtf.data.page = 0
-#inmtf.perstype1.page = 1
-#inmtf.perstype2.page = 2
-#inmtf.perstype3.page = 3
-#inmtf.perstype4.page = 4
-#inmtf.perstype5.page = 5
-#inmtf.perstype6.page = 6
-#inmtf.perstype7.page = 7
-#inmtf.perstype8.page = 8
-#
-##UECs for at work subtour frequency model
-#awtf.uec.file = AtWorkSubtourFrequency.xls
-#awtf.data.page = 0
-#awtf.model.page = 1
-#
-##UECs for stop frequency model
-#stf.uec.file = StopFrequency.xls
-#stf.purposeLookup.proportions = StopPurposeLookupProportions.csv
-#stf.data.page = 0
-#stf.work.page = 1
-#stf.univ.page = 2
-#stf.school.page = 3
-#stf.escort.page = 4
-#stf.shop.page = 5
-#stf.maint.page = 6
-#stf.eat.page = 7
-#stf.visit.page = 8
-#stf.discr.page = 9
-#stf.subtour.page = 10
-#
-##UECs for stop location choice model
-#slc.uec.file = StopLocationChoice.xls
-#slc.uec.data.page = 0
-#slc.mandatory.uec.model.page = 1
-#slc.maintenance.uec.model.page = 2
-#slc.discretionary.uec.model.page = 3
-#slc.alts.file = SlcAlternatives.csv
-#
-#slc.soa.uec.file = SlcSoaSize.xls
-#slc.soa.alts.file = DestinationChoiceAlternatives.csv
-#
-#auto.slc.soa.distance.uec.file = SlcSoaDistanceUtility.xls
-#auto.slc.soa.distance.data.page = 0
-#auto.slc.soa.distance.model.page = 1
-#
-#slc.soa.size.uec.file = SlcSoaSize.xls
-#slc.soa.size.uec.data.page = 0
-#slc.soa.size.uec.model.page = 1
-#
-#stop.depart.arrive.proportions = StopDepartArriveProportions.csv
-#
-##UECs for trip mode choice model
-#tripModeChoice.uec.file = TripModeChoice.xls
-#
-## utility coefficients by tour purpose (work, univ, school, maintenance, discretionary, work-based). These are at trip level.
-#trip.utility.ivt.coeffs = -0.032,-0.032,-0.02,-0.034,-0.03,-0.064
-#trip.utility.income.coeffs = -1.25,-0.524,-0.524,-0.524,-0.524,-0.524
-#trip.utility.income.exponents = 0.6,0.5,0.5,0.5,0.5,0.5
-#
-#
-##UECs for parking location choice model
-#plc.uec.file = ParkLocationChoice.xls
-#plc.uec.data.page = 0
-#plc.uec.model.page = 1
-#
-#plc.alts.corresp.file = ParkLocationAlts.csv
-#plc.alts.file = ParkLocationSampleAlts.csv
-#
-#mgra.avg.cost.output.file = output/mgraParkingCost.csv
-#
-#mgra.avg.cost.dist.coeff.work = -8.6
-#mgra.avg.cost.dist.coeff.other = -4.9
-#
-#park.cost.reimb.mean = -0.05
-#park.cost.reimb.std.dev = 0.54
-#
-##UECs for best transit path finding
-#utility.bestTransitPath.uec.file = BestTransitPathUtility.xls
-#utility.bestTransitPath.data.page = 0
-#utility.bestTransitPath.tapToTap.page = 1
-#utility.bestTransitPath.walkAccess.page = 2
-#utility.bestTransitPath.driveAccess.page = 3
-#utility.bestTransitPath.walkEgress.page = 4
-#utility.bestTransitPath.driveEgress.page = 5
-#utility.bestTransitPath.driveAccDisutility.page = 6
-#utility.bestTransitPath.driveEgrDisutility.page = 7
-#utility.bestTransitPath.skim.sets = 3
-#utility.bestTransitPath.alts = 4
-#utility.bestTransitPath.maxPathsPerSkimSetForLogsum = 1,1,1
-#utility.bestTransitPath.nesting.coeff = 0.24
-#
-##UECs for auto skimming
-#skims.auto.uec.file = AutoSkims.xls
-#skims.auto.data.page = 0
-#skims.auto.ea.page = 1
-#skims.auto.am.page = 2
-#skims.auto.md.page = 3
-#skims.auto.pm.page = 4
-#skims.auto.ev.page = 5
-#
 ##UECs for TAZ distances
 taz.distance.uec.file = tazDistance.xls
 taz.distance.data.page = 0
@@ -777,225 +311,23 @@ taz.od.time.md.page = 8
 taz.od.time.pm.page = 9
 taz.od.time.ev.page = 10
 #
-#
-##UECs for walk-transit-walk skimming
-#skim.walk.transit.walk.uec.file = WalkTransitWalkSkims.xls
-#skim.walk.transit.walk.data.page = 0
-#skim.walk.transit.walk.skim.page = 1
-#skim.walk.transit.walk.skims = 13
-#
-##UECs for walk-transit-drive skimming
-#skim.walk.transit.drive.uec.file = WalkTransitDriveSkims.xls
-#skim.walk.transit.drive.data.page = 0
-#skim.walk.transit.drive.skim.page = 1
-#skim.walk.transit.drive.skims = 13
-#
-##UECs for drive-transit-walk skimming
-#skim.drive.transit.walk.uec.file = DriveTransitWalkSkims.xls
-#skim.drive.transit.walk.data.page = 0
-#skim.drive.transit.walk.skim.page = 1
-#skim.drive.transit.walk.skims = 13
-#
-#
-######################################################################################
-## IE Model Settings (run as part of CT-RAMP)
-######################################################################################
-#
-#RunModel.InternalExternal = true
-#
-#ie.uec.file = InternalExternalTripChoice.xls
-#ie.data.page = 0
-#ie.model.page = 1
-#ie.logsum.distance.coeff = -0.05
-#external.tazs = 1,2,3,4,5,6,7,8,9,10,11,12
-#
-#
-#internalExternal.dc.uec.file = InternalExternalDestinationChoice.xls
-#internalExternal.dc.uec.data.page = 0
-#internalExternal.dc.uec.model.page = 1
-#internalExternal.dc.uec.alts.file = InternalExternalDestinationChoiceAlternatives.csv
-#
-#internalExternal.tour.tod.file = input/internalExternal_tourTOD.csv
-#
-#internalExternal.trip.mc.uec.file = InternalExternalTripModeChoice.xls
-#internalExternal.trip.mc.data.page = 0
-#internalExternal.trip.mc.model.page = 1
-#
-#internalExternal.trip.output.file = output/internalExternalTrips.csv
-#
-#internalExternal.results.autoTripMatrix = output/autoInternalExternalTrips
-#internalExternal.results.nMotTripMatrix = output/nmotInternalExternalTrips
-#internalExternal.results.tranTripMatrix = output/tranInternalExternalTrips
-#internalExternal.results.othrTripMatrix = output/othrInternalExternalTrips
-#
 ######################################################################################
 ## Cross-Border Model Settings
 ######################################################################################
-#crossBorder.purpose.nonsentri.file = input/crossBorder_tourPurpose_nonSENTRI.csv
-#crossBorder.purpose.sentri.file = input/crossBorder_tourPurpose_SENTRI.csv
-#
-#crossBorder.tour.tod.file = input/crossBorder_tourEntryAndReturn.csv
-#
-#crossBorder.dc.soa.uec.file = CrossBorderDestinationChoiceSample.xls
-#crossBorder.dc.soa.data.page = 0
-#crossBorder.dc.soa.model.page = 1
-#crossBorder.dc.soa.size.page = 2
-#crossborder.dc.soa.alts.file = CrossBorderDestinationChoiceSoaAlternatives2020.csv
-#
-#crossBorder.dc.uec.file = CrossBorderDestinationChoice2020.xls
-#crossBorder.dc.data.page = 0
-#crossBorder.dc.model.page = 1
-#crossborder.dc.alts.file = CrossBorderDestinationChoiceAlternatives.csv
-#
-#crossBorder.dc.colonia.file = input/crossBorder_supercolonia.csv
-#crossBorder.dc.colonia.distance.parameter = -0.19
-#crossBorder.dc.soa.sampleRate = 30
-#
-##crossBorder.tour.mc.uec.file = CrossBorderTourModeChoice.xls
-#crossBorder.tour.mc.uec.file = CrossBorderTourModeChoice2020.xls
-#crossBorder.tour.mc.data.page = 0
-#crossBorder.tour.mc.mandatory.model.page = 1
-#crossBorder.tour.mc.nonmandatory.model.page = 2
-#crossBorder.poe.waittime.file = input/crossBorder_pointOfEntryWaitTime.csv
-#
-#crossBorder.trip.mc.uec.file = CrossBorderTripModeChoice.xls
-#crossBorder.trip.mc.data.page = 0
-#crossBorder.trip.mc.model.page = 1
-#
-#crossBorder.stop.frequency.file = input/crossBorder_stopFrequency.csv
-#crossBorder.stop.purpose.file = input/crossBorder_stopPurpose.csv
-#
-#crossBorder.slc.soa.uec.file = CrossBorderStopLocationChoiceSample.xls
-#crossBorder.slc.soa.data.page = 0
-#crossBorder.slc.soa.model.page = 1
-#crossBorder.slc.soa.alts.file = SoaTazDistAlts.csv
-#
-#crossBorder.slc.uec.file = CrossBorderStopLocationChoice.xls
-#crossBorder.slc.data.page = 0
-#crossBorder.slc.model.page = 1
-#
-#crossBorder.stop.outbound.duration.file = input/crossBorder_outboundStopDuration.csv
-#crossBorder.stop.inbound.duration.file = input/crossBorder_inboundStopDuration.csv
-#
-#crossBorder.tour.output.file = output/crossBorderTours.csv
 crossBorder.trip.output.file = output/crossborder/final_trips.csv
-#
-#crossBorder.results.autoTripMatrix = output/autoCrossBorderTrips
-#crossBorder.results.nMotTripMatrix = output/nmotCrossBorderTrips
-#crossBorder.results.tranTripMatrix = output/tranCrossBorderTrips
-#crossBorder.results.othrTripMatrix = output/othrCrossBorderTrips
-#
 ######################################################################################
 ## Visitor Model Settings
 ######################################################################################
-#visitor.business.tour.file = input/visitor_businessFrequency.csv
-#visitor.personal.tour.file = input/visitor_personalFrequency.csv
-#
-#visitor.partySize.file = input/visitor_partySize.csv
-#visitor.autoAvailable.file = input/visitor_autoAvailable.csv
-#visitor.income.file = input/visitor_income.csv
-#
-#visitor.dc.soa.uec.file = VisitorDestinationChoiceSample.xls
-#visitor.dc.soa.data.page = 0
-#visitor.dc.soa.work.page = 1
-#visitor.dc.soa.recreate.page = 2
-#visitor.dc.soa.dining.page = 3
-#visitor.dc.soa.size.page = 4
-#visitor.dc.soa.alts.file = SoaTazDistAlts.csv
-#
-#visitor.dc.uec.file = VisitorDestinationChoice.xls
-#visitor.dc.data.page = 0
-#visitor.dc.work.page = 1
-#visitor.dc.recreate.page = 2
-#visitor.dc.dining.page = 3
-#
-#visitor.tour.tod.file = input/visitor_tourTOD.csv
-#
-#visitor.mc.uec.file = VisitorTourModeChoice.xls
-#visitor.mc.data.page = 0
-#visitor.mc.model.page = 1
-#
-#visitor.stop.frequency.file = input/visitor_stopFrequency.csv
-#visitor.stop.purpose.file = input/visitor_stopPurpose.csv
-#visitor.stop.outbound.duration.file = input/visitor_outboundStopDuration.csv
-#visitor.stop.inbound.duration.file = input/visitor_inboundStopDuration.csv
-#
-#visitor.slc.soa.uec.file = VisitorStopLocationChoiceSample.xls
-#visitor.slc.soa.data.page = 0
-#visitor.slc.soa.model.page = 1
-#
-#visitor.slc.uec.file = VisitorStopLocationChoice.xls
-#visitor.slc.data.page = 0
-#visitor.slc.model.page = 1
-#
-#visitor.trip.mc.uec.file = VisitorTripModeChoice.xls
-#visitor.trip.mc.data.page = 0
-#visitor.trip.mc.model.page = 1
-#
-#visitor.micromobility.uec.file = VisitorMicromobilityChoice.xls
-#visitor.micromobility.data.page = 0
-#visitor.micromobility.model.page = 1
-#
-#
-#
-#
-#visitor.tour.output.file = output/visitorTours.csv
 visitor.trip.output.file = output/visitor/final_trips.csv
 #
-#visitor.results.autoTripMatrix = output/autoVisitorTrips
-#visitor.results.nMotTripMatrix = output/nmotVisitorTrips
-#visitor.results.tranTripMatrix = output/tranVisitorTrips
-#visitor.results.othrTripMatrix = output/othrVisitorTrips
-#
-#
-## These settings are for building an estimation file, not used for main visitor model code
-#visitor.uec.file = VisitorSize.xls
-#visitor.uec.data.page = 0
-#visitor.uec.sizeTerms.page = 1
-#
 ######################################################################################
 ## SAN Airport Model Settings
 ######################################################################################
-#airport.SAN.purpose.file = input/airport_purpose.SAN.csv
-#airport.SAN.size.file = input/airport_party.SAN.csv
-#airport.SAN.duration.file = input/airport_nights.SAN.csv
-#airport.SAN.income.file = input/airport_income.SAN.csv
-#airport.SAN.departureTime.file = input/airport_departure.SAN.csv
-#airport.SAN.arrivalTime.file = input/airport_arrival.SAN.csv
 airport.SAN.output.file = output/airport.SAN/final_santrips.csv
 #
-#airport.SAN.dc.uec.file = AirportDestinationChoice.SAN.xls
-#airport.SAN.dc.data.page = 0
-#airport.SAN.dc.size.page = 5
-#airport.SAN.dc.segment1.page = 1
-#airport.SAN.dc.segment2.page = 2
-#airport.SAN.dc.segment3.page = 3
-#airport.SAN.dc.segment4.page = 4
-#
-#airport.SAN.mc.uec.file = AirportModeChoice.SAN2016.xls
-#airport.SAN.mc.data.page = 0
-#airport.SAN.mc.da.page = 1
-#airport.SAN.mc.s2.page = 2
-#airport.SAN.mc.s3.page = 3
-#airport.SAN.mc.transit.page = 4
-#airport.SAN.mc.accessMode.page = 5
-#
-#airport.SAN.externalStationFile = uec/InternalExternalDestinationChoiceAlternatives.csv
-#
-#airport.SAN.results.autoTripMatrix = output/autoAirportTrips.SAN
-#airport.SAN.results.nMotTripMatrix = output/nmotAirportTrips.SAN
-#airport.SAN.results.tranTripMatrix = output/tranAirportTrips.SAN
-#airport.SAN.results.othrTripMatrix = output/othrAirportTrips.SAN
-#
 ######################################################################################
 ## CBX Airport Model Settings
 ######################################################################################
-#airport.CBX.purpose.file = input/airport_purpose.CBX.csv
-#airport.CBX.size.file = input/airport_party.CBX.csv
-#airport.CBX.duration.file = input/airport_nights.CBX.csv
-#airport.CBX.income.file = input/airport_income.CBX.csv
-#airport.CBX.departureTime.file = input/airport_departure.CBX.csv
-#airport.CBX.arrivalTime.file = input/airport_arrival.CBX.csv
 airport.CBX.output.file = output/airport.CBX/final_cbxtrips.csv
 RunModel.skipTransitConnector = true
 RunModel.skipExternal = false,false,false
@@ -1080,21 +412,6 @@ AtTransitConsistency.yThreshold = 1.0
 #####################################################################################
 # Commercial Vehicle Model Settings
 #####################################################################################
-#scale factor to use in cvm trip generation. Also, used during demand import to factor-in demand accordingly
-#cvm.scale_factor = 1
-#scale factors by vehicle (light, medium, and heavy) and time of day (ea,am,md,pm,ev) - used to boost cvm demand
-#light vehicles
-#cvm.scale_light = 1,2,3.5,2,1
-#medium vehicles
-#cvm.scale_medium = 1,1,1,1,1
-#heavy vehicles
-#cvm.scale_heavy = 1,1,1,1,1
-#cvm vehicle shares representing portions of the cvm vehicle trips that go to light-heavy trucks.
-#share value should be between 0 and 1. 0 representing none will go to light-heavy truck and 1 means all will go.
-#cvm.share.light = 0.04
-#cvm.share.medium = 0.64
-#cvm.share.heavy = 0
-
 #cvm vehicle shares representing portions of the cvm vehicle trips by value of time
 cvm.vot.share.low = 0.0
 cvm.vot.share.medium = 0.0