New framework - catch
Cleanups