cleanup
more testing