Take out more SGX stuff