Remove unused includes and out of date comment. NFC.