Get rid of the finally block