cleanups after discussion