[multi-site] cleanup TODO notes