More PEX cleanup