attempt at cleanup