next attempt at cleanup