Cleanups to CACTI.