cleanups as we're going through the deck