remove some unecessary try/catch block