33rd try at cleanup