Remove support for 500 calls