Cleaned up unnecessary try, except, finally block