Breaking out Deck and doing some cleanup.