cleanup
more figures