Remove hardcode from cityPlan years. Clean up unused functions.