Removing namespace changing code because the API does not support it