Remove async Exception handling