clean up nbsp, replace old gcal markup with new markup, still commented out