Cooper: cleanup