TEST: cleanup