attempt at cleanup
cleanup