Merge "profcollect: Clean up stale comments. NFC." into main