remove CATCH_EXIT_CODE and make it the default behavior