Refactored terminate to destroy