remove finalizers
clean up examples, improve handling