cleanup|smarter