atg. better cleanup