I went ahead (changeset 174842033) and deleted the separate cycleways, instead using the cycleway:both=lane and cycleway:both:buffer=yes tags on the roads themselves. This is how such cycleways in SoCal are overwhelmingly mapped. 

If you want to preserve the name “North Chorro Neighborhood Greenway”, then please create a new relation with all the road segments that make it up, and add the name there. Was the creation of a relations for California Cycle Route 95 also your work? That will also need to be adjusted accordingly.