Commented code relying on outdated ClientEngine/Friends