Freed some resources and added a bench