Remove non-existent header, add missing import, remove redundancy.