More or less cleanup.