More insult cleanup