Removed helpers, no needed finally