Issue #2027877 by mpgeek: Fixed Terms are not cleaned up after scenario exit.