Remove the SDK specific stuff