Another attempt at cleanup