Further simulation cleanup