Merge "Cleanup outdated TODOs" into rvc-dev