Reduce number of terminate methods