2nd attempt at cleanup