TERP cleanup