Some cleanup for the experiment