Cleanup of some of the campaign code