Drop try/finally and just move clean up before assert