another attempt at cleanup