[multisite] Cleanup TODO notes