Take out more SGX code