Remove the terminate logic