more verbose, better cleanup