Some clean-up that was out of sync.