third try at cleanup