Remove try/catch block